Skip to content

Commit e450f06

Browse files
authored
Merge branch 'master' into mandlil-patch-6
2 parents 8cf89d7 + 5df5ce2 commit e450f06

File tree

74 files changed

+22186
-21862
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+22186
-21862
lines changed

.github/workflows/cpp-unit-test.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# This workflow builds and unit tests both main C++ API and also build/data tools for metadata generation.
2+
3+
name: Testing C++ API
4+
on: pull_request
5+
permissions:
6+
contents: read
7+
8+
jobs:
9+
cpp-test:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Harden Runner
13+
uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
14+
with:
15+
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
16+
17+
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
18+
19+
- name: Set up C++ environment
20+
run: |
21+
sudo apt-get install \
22+
cmake cmake-curses-gui libprotobuf-dev libgtest-dev libre2-dev \
23+
libicu-dev libboost-dev libboost-thread-dev libboost-system-dev \
24+
protobuf-compiler
25+
26+
- name: Build C++
27+
run: |
28+
cd cpp
29+
mkdir build
30+
cd build
31+
cmake ..
32+
make
33+
34+
- name: Test C++ Build Tools
35+
run: |
36+
./cpp/build/tools/generate_geocoding_data_test
37+
38+
- name: Test C++ API
39+
run: |
40+
./cpp/build/libphonenumber_test

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Cream Sandwich).
5555
The [Java demo](https://libphonenumber.appspot.com/) is updated with a slight
5656
delay after the GitHub release.
5757

58-
Last demo update: v8.13.47.
58+
Last demo update: v8.13.49.
5959

6060
Note: Even though the library (main branch/[maven release](https://repo1.maven.org/maven2/com/googlecode/libphonenumber/libphonenumber/8.12.56/))
6161
is at v8.12.57, because of some deployment issues, we were unable to update the

cpp/src/phonenumbers/lite_metadata.cc

Lines changed: 9216 additions & 9205 deletions
Large diffs are not rendered by default.

cpp/src/phonenumbers/metadata.cc

Lines changed: 10971 additions & 10957 deletions
Large diffs are not rendered by default.

cpp/src/phonenumbers/short_metadata.cc

Lines changed: 1374 additions & 1360 deletions
Large diffs are not rendered by default.

java/build.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@
7777
<arg value="--output-dir=${libphonenumber.test.dir}/com/google/i18n/phonenumbers"/>
7878
<arg value="--data-prefix=data/PhoneNumberMetadataProtoForTesting"/>
7979
<arg value="--mapping-class=CountryCodeToRegionCodeMapForTesting"/>
80-
<arg value="--copyright=2010"/>
80+
<arg value="--copyright=2011"/>
8181
<arg value="--lite-build=false"/>
82+
<arg value="--build-regioncode=true"/>
8283
</exec>
8384
</target>
8485

java/carrier/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.googlecode.libphonenumber</groupId>
55
<artifactId>carrier</artifactId>
6-
<version>1.232-SNAPSHOT</version>
6+
<version>1.234-SNAPSHOT</version>
77
<packaging>jar</packaging>
88
<url>https://github.com/google/libphonenumber/</url>
99

1010
<parent>
1111
<groupId>com.googlecode.libphonenumber</groupId>
1212
<artifactId>libphonenumber-parent</artifactId>
13-
<version>8.13.48-SNAPSHOT</version>
13+
<version>8.13.50-SNAPSHOT</version>
1414
</parent>
1515

1616
<build>
@@ -79,12 +79,12 @@
7979
<dependency>
8080
<groupId>com.googlecode.libphonenumber</groupId>
8181
<artifactId>libphonenumber</artifactId>
82-
<version>8.13.48-SNAPSHOT</version>
82+
<version>8.13.50-SNAPSHOT</version>
8383
</dependency>
8484
<dependency>
8585
<groupId>com.googlecode.libphonenumber</groupId>
8686
<artifactId>prefixmapper</artifactId>
87-
<version>2.242-SNAPSHOT</version>
87+
<version>2.244-SNAPSHOT</version>
8888
</dependency>
8989
</dependencies>
9090

Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)