Merge branch 'master' into extension-formatting

google · Dec 3, 2024 · 80ee2c2 · 80ee2c2
2 parents df368aa + 8e85fad
commit 80ee2c2
Show file tree

Hide file tree

Showing 96 changed files with 24,333 additions and 24,111 deletions.
diff --git a/.github/workflows/osv-scanner-unified.yml b/.github/workflows/osv-scanner-unified.yml
@@ -0,0 +1,54 @@
+
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: OSV-Scanner
+
+on:
+  pull_request:
+    branches: ["master"]
+  schedule:
+  - cron: "12 12 * * 1"
+  push:
+    branches: ["master"]
+
+permissions:
+  # Required to upload SARIF file to CodeQL. See: https://github.com/github/codeql-action/issues/2117
+  actions: read
+  # Require writing security events to upload SARIF file to security tab
+  security-events: write
+  # Read commit contents
+  contents: read
+
+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
+    with:
+       # Just scan the root directory and docs, since everything else is fixtures
+      scan-args: |-
+        -r
+        --skip-git
+        ./
+  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
+    with:
+      # Just scan the root directory and docs, since everything else is fixtures
+      scan-args: |-
+        -r
+        --skip-git
+        ./
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.50.
+Last demo update: v8.13.51.
 
 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/cpp/src/phonenumbers/phonenumberutil.cc b/cpp/src/phonenumbers/phonenumberutil.cc
diff --git a/cpp/src/phonenumbers/phonenumberutil.h b/cpp/src/phonenumbers/phonenumberutil.h
diff --git a/cpp/src/phonenumbers/stringutil.cc b/cpp/src/phonenumbers/stringutil.cc
@@ -134,10 +134,6 @@ StringHolder::StringHolder(uint64 n)
   : absl::AlphaNum(n)
 {}
 
-StringHolder::StringHolder(absl::string_view sv)
-  : absl::AlphaNum(sv)
-{}
-
 StringHolder::~StringHolder() {}
 
 // StrCat
@@ -297,4 +293,4 @@ void StrAppend(string* dest, const StringHolder& s1, const StringHolder& s2,
 }
 
 }  // namespace phonenumbers
-}  // namespace i18n
+}  // namespace i18n
diff --git a/cpp/src/phonenumbers/stringutil.h b/cpp/src/phonenumbers/stringutil.h
@@ -80,10 +80,9 @@ int GlobalReplaceSubstring(const string& substring, const string& replacement,
 class StringHolder: public absl::AlphaNum {
  public:
   // Don't make the constructors explicit to make the StrCat usage convenient.
-  StringHolder(const string& s);       // NOLINT(runtime/explicit)
-  StringHolder(const char* s);         // NOLINT(runtime/explicit)
-  StringHolder(uint64_t n);            // NOLINT(runtime/explicit)
-  StringHolder(absl::string_view sv);  // NOLINT(runtime/explicit)
+  StringHolder(const string& s);  // NOLINT(runtime/explicit)
+  StringHolder(const char* s);    // NOLINT(runtime/explicit)
+  StringHolder(uint64_t n);         // NOLINT(runtime/explicit)
   ~StringHolder();
 
   const absl::string_view GetString() const {
@@ -200,4 +199,4 @@ void StrAppend(string* dest, const StringHolder& s1, const StringHolder& s2,
 }  // namespace phonenumbers
 }  // namespace i18n
 
-#endif  // I18N_PHONENUMBERS_STRINGUTIL_H_
+#endif  // I18N_PHONENUMBERS_STRINGUTIL_H_
diff --git a/java/carrier/pom.xml b/java/carrier/pom.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0"?>
-<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">
+<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>
-  <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>carrier</artifactId>
-  <version>1.235-SNAPSHOT</version>
+  <version>1.236-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.51-SNAPSHOT</version>
+    <version>8.13.52-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -24,8 +25,10 @@
     </resources>
     <testResources>
       <testResource>
-        <directory>test/com/google/i18n/phonenumbers/carrier/testing_data</directory>
-        <targetPath>com/google/i18n/phonenumbers/carrier/testing_data</targetPath>
+        <directory>test/com/google/i18n/phonenumbers/carrier/testing_data
+        </directory>
+        <targetPath>com/google/i18n/phonenumbers/carrier/testing_data
+        </targetPath>
       </testResource>
     </testResources>
     <plugins>
@@ -35,24 +38,29 @@
         <version>5.1.9</version>
         <configuration>
           <instructions>
-          	<Fragment-Host>com.googlecode.libphonenumber</Fragment-Host>
+            <Fragment-Host>com.googlecode.libphonenumber</Fragment-Host>
           </instructions>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
         <executions>
           <execution>
             <id>default-jar</id>
             <configuration>
               <archive>
-                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                <manifestFile>
+                  ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+                </manifestFile>
+                <manifestEntries>
+                  <Automatic-Module-Name>com.google.i18n.phonenumbers.carrier
+                  </Automatic-Module-Name>
+                </manifestEntries>
               </archive>
             </configuration>
           </execution>
-		</executions>
-	  </plugin>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -79,12 +87,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.51-SNAPSHOT</version>
+      <version>8.13.52-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.245-SNAPSHOT</version>
+      <version>2.246-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1671_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1671_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/221_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/221_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/228_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/228_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_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/508_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/508_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/594_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/594_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/596_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/596_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/81_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/81_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_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.51-SNAPSHOT</version>
+  <version>8.13.52-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.51-SNAPSHOT</version>
+    <version>8.13.52-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -68,17 +68,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.51-SNAPSHOT</version>
+      <version>8.13.52-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.245-SNAPSHOT</version>
+      <version>2.246-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>1.235-SNAPSHOT</version>
+      <version>1.236-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/java/geocoder/pom.xml b/java/geocoder/pom.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0"?>
-<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">
+<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>
-  <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>geocoder</artifactId>
-  <version>2.245-SNAPSHOT</version>
+  <version>2.246-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.51-SNAPSHOT</version>
+    <version>8.13.52-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -28,12 +29,16 @@
     </resources>
     <testResources>
       <testResource>
-        <directory>test/com/google/i18n/phonenumbers/geocoding/testing_data</directory>
-        <targetPath>com/google/i18n/phonenumbers/geocoding/testing_data</targetPath>
+        <directory>test/com/google/i18n/phonenumbers/geocoding/testing_data
+        </directory>
+        <targetPath>com/google/i18n/phonenumbers/geocoding/testing_data
+        </targetPath>
       </testResource>
       <testResource>
-        <directory>test/com/google/i18n/phonenumbers/timezones/testing_data</directory>
-        <targetPath>com/google/i18n/phonenumbers/timezones/testing_data</targetPath>
+        <directory>test/com/google/i18n/phonenumbers/timezones/testing_data
+        </directory>
+        <targetPath>com/google/i18n/phonenumbers/timezones/testing_data
+        </targetPath>
       </testResource>
     </testResources>
     <plugins>
@@ -43,24 +48,29 @@
         <version>5.1.9</version>
         <configuration>
           <instructions>
-          	<Fragment-Host>com.googlecode.libphonenumber</Fragment-Host>
+            <Fragment-Host>com.googlecode.libphonenumber</Fragment-Host>
           </instructions>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
         <executions>
           <execution>
             <id>default-jar</id>
             <configuration>
               <archive>
-                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                <manifestFile>
+                  ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+                </manifestFile>
+                <manifestEntries>
+                  <Automatic-Module-Name>com.google.i18n.phonenumbers.geocoder
+                  </Automatic-Module-Name>
+                </manifestEntries>
               </archive>
             </configuration>
           </execution>
-		</executions>
-	  </plugin>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -87,12 +97,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.51-SNAPSHOT</version>
+      <version>8.13.52-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.245-SNAPSHOT</version>
+      <version>2.246-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1327_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1327_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1942_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1942_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
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
@@ -1,16 +1,17 @@
 <?xml version="1.0"?>
-<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">
+<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>
-  <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>prefixmapper</artifactId>
-  <version>2.245-SNAPSHOT</version>
+  <version>2.246-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.51-SNAPSHOT</version>
+    <version>8.13.52-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -19,8 +20,11 @@
     <testSourceDirectory>test</testSourceDirectory>
     <testResources>
       <testResource>
-        <directory>../../geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data</directory>
-        <targetPath>com/google/i18n/phonenumbers/geocoding/testing_data</targetPath>
+        <directory>
+          ../../geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data
+        </directory>
+        <targetPath>com/google/i18n/phonenumbers/geocoding/testing_data
+        </targetPath>
       </testResource>
     </testResources>
     <plugins>
@@ -30,24 +34,30 @@
         <version>5.1.9</version>
         <configuration>
           <instructions>
-          	<Fragment-Host>com.googlecode.libphonenumber</Fragment-Host>
+            <Fragment-Host>com.googlecode.libphonenumber</Fragment-Host>
           </instructions>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
         <executions>
           <execution>
             <id>default-jar</id>
             <configuration>
               <archive>
-                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                <manifestFile>
+                  ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+                </manifestFile>
+                <manifestEntries>
+                  <Automatic-Module-Name>
+                    com.google.i18n.phonenumbers.prefixmapper
+                  </Automatic-Module-Name>
+                </manifestEntries>
               </archive>
             </configuration>
           </execution>
-		</executions>
-	  </plugin>
+        </executions>
+      </plugin>
 
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -75,7 +85,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.51-SNAPSHOT</version>
+      <version>8.13.52-SNAPSHOT</version>
     </dependency>
   </dependencies>