git.iko.soy/typeable/libphonenumber
on 5e03e45 help sign in
de902c0
swap
0 ahead, 7 behind
3 files changed+24−24
since splitsnapshots
unifiedsplit
.github/workflows/ci.yaml+7−10 libphonenumber.cabal+8−11 test/Spec.hs+9−3
.github/workflows/ci.yaml+7−10
@@ -24,17 +24,14 @@ jobs:
2424 - "9.0.2"
2525 - "9.2.8"
2626 - "9.4.8"
27− - "9.6.7"
28− - "9.8.4"
29− - "9.10.3"
30− - "9.12.2"
31− - "9.14.1"
27+ - "9.6.3"
28+ - "9.8.1"
3229 fail-fast: false
3330 name: Build on Linux, GHC ${{ matrix.ghc_version }}
3431 runs-on: ${{ matrix.platform }}
3532 steps:
36− - uses: actions/checkout@v4
37− - uses: haskell-actions/setup@v2
33+ - uses: actions/checkout@v3
34+ - uses: haskell/actions/setup@v2
3835 with:
3936 ghc-version: ${{ matrix.ghc_version }}
4037 cabal-version: "3.10.1.0"
@@ -70,7 +67,7 @@ jobs:
7067 if: github.event_name == 'release'
7168 steps:
7269 - uses: actions/checkout@v3
73− - uses: haskell-actions/setup@v2
70+ - uses: haskell/actions/setup@v2
7471 with:
7572 cabal-version: "3.10.1.0"
7673 - name: Install C++ library
@@ -85,11 +82,11 @@ jobs:
8582 run: |
8683 cabal haddock --builddir "$GITHUB_WORKSPACE/doc" --haddock-for-hackage --enable-doc
8784 echo "docs=$(find "$GITHUB_WORKSPACE/doc" -maxdepth 1 -type f -name '*-docs.tar.gz')" >> "$GITHUB_ENV"
88− - uses: actions/upload-artifact@v6
85+ - uses: actions/upload-artifact@v2
8986 with:
9087 name: Source tarball
9188 path: ${{ env.dist }}
92− - uses: svenstaro/upload-release-action@2.11.3
89+ - uses: svenstaro/upload-release-action@2.2.1
9390 with:
9491 repo_token: ${{ secrets.GITHUB_TOKEN }}
9592 file: ${{ env.dist }}
libphonenumber.cabal+8−11
@@ -1,6 +1,6 @@
11cabal-version: 3.0
22name: libphonenumber
3−version: 0.1.4.0
3+version: 0.1.3.0
44category: Data
55synopsis: Parsing, formatting, and validating international phone
66 numbers
@@ -25,7 +25,7 @@ description:
2525 and to avoid a dependency on @text@, we use 'ByteString'
2626 throughout the library instead of 'Data.Text.Text'.
2727
28−copyright: 2023-2025 Typeable
28+copyright: 2023 Typeable
2929author: Typeable
3030maintainer: mniip@typeable.io
3131homepage: https://github.com/typeable/libphonenumber/
@@ -39,11 +39,8 @@ tested-with:
3939 , GHC == 9.0.2
4040 , GHC == 9.2.8
4141 , GHC == 9.4.8
42− , GHC == 9.6.7
43− , GHC == 9.8.4
44− , GHC == 9.10.3
45− , GHC == 9.12.2
46− , GHC == 9.14.1
42+ , GHC == 9.6.3
43+ , GHC == 9.8.1
4744
4845build-type: Simple
4946
@@ -64,13 +61,12 @@ library
6461 , Data.PhoneNumber.Internal.Number
6562 , Data.PhoneNumber.Internal.Util
6663 build-depends:
67− , base >= 4.12 && < 4.23
64+ , base >= 4.12 && < 4.20
6865 , bytestring >= 0.10.8 && < 0.13
69− , containers >= 0.6.0 && < 0.9
66+ , containers >= 0.6.0 && < 0.8
7067 , deepseq >= 1.4.4 && < 1.6
7168 , transformers >= 0.5.5 && < 0.7
7269 build-tool-depends: c2hs:c2hs
73− pkgconfig-depends: protobuf
7470 include-dirs: include
7571 includes:
7672 , c_phonenumber.h
@@ -80,6 +76,7 @@ library
8076 , cxxbits/c_phonenumberutil.cpp
8177 extra-libraries:
8278 , phonenumber
79+ , protobuf
8380 if impl(ghc >= 9.4)
8481 build-depends: system-cxx-std-lib
8582 else
@@ -111,7 +108,7 @@ test-suite spec_test
111108 , containers
112109 , hspec >= 2.10.8 && < 2.12
113110 , libphonenumber
114− , QuickCheck >= 2.13.1 && < 2.16
111+ , QuickCheck >= 2.13.1 && < 2.15
115112 main-is: Spec.hs
116113 hs-source-dirs: test
117114 default-language: Haskell2010
test/Spec.hs+9−3
@@ -125,9 +125,15 @@ main = hspec $ modifyMaxSuccess (* 10) $ do
125125 prop "returns only ASCII digits" $ \(ParsedNumber _ pn) ->
126126 BSC.all (`elem` ['0'..'9']) $ nationalSignificantNumber pn
127127 modifyMaxDiscardRatio (* 10) $ do
128− prop "concatenated with country code parses to the original (if valid)" $
129− \(ParsedNumber _ pn) ->
130− isValidNumber Nothing pn ==>
128+ prop "concatenated with country code parses to the original (if valid and not MX)" $
129+ \(ParsedNumber (_, mReg, ParserInput input) pn) ->
130+ -- Apparently "+52112210000000" makes the parser/formatter do weird
131+ -- stuff as it tries to handle the deprecated (?) mobile token ("1"
132+ -- after "+52")
133+ if "5211" `BS.isPrefixOf` normalizeNumber Digits input ||
134+ mReg == Just "MX" && "11" `BS.isPrefixOf` normalizeNumber Digits input
135+ then discard
136+ else isValidNumber Nothing pn ==>
131137 let
132138 cc = countryCode pn
133139 nsn = nationalSignificantNumber pn