Merge branch 'master' into name-mismatch

google · Jan 28, 2025 · bc18aa1 · bc18aa1
2 parents b476cd9 + 48aa193
commit bc18aa1
Show file tree

Hide file tree

Showing 71 changed files with 20,075 additions and 20,091 deletions.
diff --git a/.github/workflows/osv-scanner-unified.yml b/.github/workflows/osv-scanner-unified.yml
@@ -35,7 +35,7 @@ jobs:
   scan-scheduled:
     if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
     # If you want to copy this config, highly suggest pinning this version to a release rather than tracking the main branch
-    uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
     with:
        # Just scan the root directory and docs, since everything else is fixtures
       scan-args: |-
@@ -45,7 +45,7 @@ jobs:
   scan-pr:
     if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
     # If you want to copy this config, highly suggest pinning this version to a release rather than tracking the main branch
-    uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
     with:
       # Just scan the root directory and docs, since everything else is fixtures
       scan-args: |-

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,14 @@
-target/
-!tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar
-build/
-lib/
-generated/
+# Ignore build directories and any files generated by the update script.
+cpp/build/
+cpp/src/phonenumbers/geocoding/geocoding_data.cc
+cpp/src/phonenumbers/phonemetadata.pb.*
+cpp/src/phonenumbers/phonenumber.pb.*
+cpp/test/phonenumbers/geocoding/geocoding_test_data.cc
+java/build/
+java/demo/war/WEB-INF/classes/
+java/demo/war/WEB-INF/lib/
+java/**/target/
+# Ignore the logs directory
+/logs/
+# Ignore ourselves because this is not intended to be submitted.
+/.gitignore
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ Cream Sandwich).
 The [Java demo](https://libphonenumber.appspot.com/) is updated with a slight
 delay after the GitHub release.
 
-Last demo update: v8.13.52.
+Last demo update: v8.13.53.
 
 Note: Even though the library (main branch/[maven release](https://repo1.maven.org/maven2/com/googlecode/libphonenumber/libphonenumber/8.12.56/))
 is at v8.12.57, because of some deployment issues, we were unable to update the

diff --git a/cpp/src/phonenumbers/lite_metadata.cc b/cpp/src/phonenumbers/lite_metadata.cc
diff --git a/cpp/src/phonenumbers/metadata.cc b/cpp/src/phonenumbers/metadata.cc
diff --git a/java/carrier/pom.xml b/java/carrier/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>carrier</artifactId>
-  <version>1.237-SNAPSHOT</version>
+  <version>1.238-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.53-SNAPSHOT</version>
+    <version>8.13.54-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -81,12 +81,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.53-SNAPSHOT</version>
+      <version>8.13.54-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.247-SNAPSHOT</version>
+      <version>2.248-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/371_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/371_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/680_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/680_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en
diff --git a/java/demo/pom.xml b/java/demo/pom.xml
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>8.13.53-SNAPSHOT</version>
+  <version>8.13.54-SNAPSHOT</version>
   <packaging>war</packaging>
   <url>https://github.com/google/libphonenumber/</url>
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.53-SNAPSHOT</version>
+    <version>8.13.54-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -68,17 +68,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.53-SNAPSHOT</version>
+      <version>8.13.54-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.247-SNAPSHOT</version>
+      <version>2.248-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>1.237-SNAPSHOT</version>
+      <version>1.238-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/java/geocoder/pom.xml b/java/geocoder/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geocoder</artifactId>
-  <version>2.247-SNAPSHOT</version>
+  <version>2.248-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.53-SNAPSHOT</version>
+    <version>8.13.54-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -91,12 +91,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.53-SNAPSHOT</version>
+      <version>8.13.54-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.247-SNAPSHOT</version>
+      <version>2.248-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
diff --git a/java/internal/prefixmapper/pom.xml b/java/internal/prefixmapper/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>prefixmapper</artifactId>
-  <version>2.247-SNAPSHOT</version>
+  <version>2.248-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.53-SNAPSHOT</version>
+    <version>8.13.54-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.53-SNAPSHOT</version>
+      <version>8.13.54-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/java/libphonenumber/pom.xml b/java/libphonenumber/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>libphonenumber</artifactId>
-  <version>8.13.53-SNAPSHOT</version>
+  <version>8.13.54-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.53-SNAPSHOT</version>
+    <version>8.13.54-SNAPSHOT</version>
   </parent>
 
   <build>

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
diff --git a/java/pom.xml b/java/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber-parent</artifactId>
-  <version>8.13.53-SNAPSHOT</version>
+  <version>8.13.54-SNAPSHOT</version>
   <packaging>pom</packaging>
   <url>https://github.com/google/libphonenumber/</url>