git.iko.soy/typeable/libphonenumber
on main help sign in
swap
de902c06 ahead, 0 behind
3 files changed+20−24
since splitsnapshots
unifiedsplit
.github/workflows/ci.yaml+9−8 libphonenumber.cabal+8−7 test/Spec.hs+3−9
.github/workflows/ci.yaml+9−8
@@ -24,16 +24,17 @@ jobs:
2424 - "9.0.2"
2525 - "9.2.8"
2626 - "9.4.8"
27− - "9.6.6"
27+ - "9.6.7"
2828 - "9.8.4"
29− - "9.10.1"
30− - "9.12.1"
29+ - "9.10.3"
30+ - "9.12.2"
31+ - "9.14.1"
3132 fail-fast: false
3233 name: Build on Linux, GHC ${{ matrix.ghc_version }}
3334 runs-on: ${{ matrix.platform }}
3435 steps:
35− - uses: actions/checkout@v3
36− - uses: haskell/actions/setup@v2
36+ - uses: actions/checkout@v4
37+ - uses: haskell-actions/setup@v2
3738 with:
3839 ghc-version: ${{ matrix.ghc_version }}
3940 cabal-version: "3.10.1.0"
@@ -69,7 +70,7 @@ jobs:
6970 if: github.event_name == 'release'
7071 steps:
7172 - uses: actions/checkout@v3
72− - uses: haskell/actions/setup@v2
73+ - uses: haskell-actions/setup@v2
7374 with:
7475 cabal-version: "3.10.1.0"
7576 - name: Install C++ library
@@ -84,11 +85,11 @@ jobs:
8485 run: |
8586 cabal haddock --builddir "$GITHUB_WORKSPACE/doc" --haddock-for-hackage --enable-doc
8687 echo "docs=$(find "$GITHUB_WORKSPACE/doc" -maxdepth 1 -type f -name '*-docs.tar.gz')" >> "$GITHUB_ENV"
87− - uses: actions/upload-artifact@v2
88+ - uses: actions/upload-artifact@v6
8889 with:
8990 name: Source tarball
9091 path: ${{ env.dist }}
91− - uses: svenstaro/upload-release-action@2.2.1
92+ - uses: svenstaro/upload-release-action@2.11.3
9293 with:
9394 repo_token: ${{ secrets.GITHUB_TOKEN }}
9495 file: ${{ env.dist }}
libphonenumber.cabal+8−7
@@ -1,6 +1,6 @@
11cabal-version: 3.0
22name: libphonenumber
3−version: 0.1.3.0
3+version: 0.1.4.0
44category: Data
55synopsis: Parsing, formatting, and validating international phone
66 numbers
@@ -39,10 +39,11 @@ tested-with:
3939 , GHC == 9.0.2
4040 , GHC == 9.2.8
4141 , GHC == 9.4.8
42− , GHC == 9.6.6
42+ , GHC == 9.6.7
4343 , GHC == 9.8.4
44− , GHC == 9.10.1
45− , GHC == 9.12.1
44+ , GHC == 9.10.3
45+ , GHC == 9.12.2
46+ , GHC == 9.14.1
4647
4748build-type: Simple
4849
@@ -63,12 +64,13 @@ library
6364 , Data.PhoneNumber.Internal.Number
6465 , Data.PhoneNumber.Internal.Util
6566 build-depends:
66− , base >= 4.12 && < 4.22
67+ , base >= 4.12 && < 4.23
6768 , bytestring >= 0.10.8 && < 0.13
68− , containers >= 0.6.0 && < 0.8
69+ , containers >= 0.6.0 && < 0.9
6970 , deepseq >= 1.4.4 && < 1.6
7071 , transformers >= 0.5.5 && < 0.7
7172 build-tool-depends: c2hs:c2hs
73+ pkgconfig-depends: protobuf
7274 include-dirs: include
7375 includes:
7476 , c_phonenumber.h
@@ -78,7 +80,6 @@ library
7880 , cxxbits/c_phonenumberutil.cpp
7981 extra-libraries:
8082 , phonenumber
81− , protobuf
8283 if impl(ghc >= 9.4)
8384 build-depends: system-cxx-std-lib
8485 else
test/Spec.hs+3−9
@@ -125,15 +125,9 @@ 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 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 ==>
128+ prop "concatenated with country code parses to the original (if valid)" $
129+ \(ParsedNumber _ pn) ->
130+ isValidNumber Nothing pn ==>
137131 let
138132 cc = countryCode pn
139133 nsn = nationalSignificantNumber pn