Merge branch 'master' into extension-formatting

google · Dec 12, 2024 · 9badcdb · 9badcdb
2 parents 1550768 + 9fc0f28
commit 9badcdb
Show file tree

Hide file tree

Showing 58 changed files with 28,167 additions and 28,531 deletions.
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/short_metadata.cc b/cpp/src/phonenumbers/short_metadata.cc
diff --git a/java/carrier/pom.xml b/java/carrier/pom.xml
@@ -52,10 +52,6 @@
                 <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>

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/45_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
diff --git a/java/demo/pom.xml b/java/demo/pom.xml
@@ -16,8 +16,8 @@
     <app.deploy.project>libphonenumber-hrd</app.deploy.project>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
     <archiveClasses>true</archiveClasses>
     <soy.root>${project.basedir}/src/main/resources/com/google/phonenumbers/demo</soy.root>

diff --git a/java/demo/src/main/webapp/WEB-INF/appengine-web.xml b/java/demo/src/main/webapp/WEB-INF/appengine-web.xml
@@ -2,7 +2,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>libphonenumber-hrd</application>
   <version>1</version>
-  <runtime>java11</runtime>
+  <runtime>java17</runtime>
   <threadsafe>true</threadsafe>
 
   <!-- Configure java.util.logging -->

diff --git a/java/geocoder/pom.xml b/java/geocoder/pom.xml
@@ -62,10 +62,6 @@
                 <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>

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh
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/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK
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_JP b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK
diff --git a/javascript/i18n/phonenumbers/demo-compiled.js b/javascript/i18n/phonenumbers/demo-compiled.js
diff --git a/javascript/i18n/phonenumbers/metadata.js b/javascript/i18n/phonenumbers/metadata.js
diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js
diff --git a/javascript/i18n/phonenumbers/shortnumbermetadata.js b/javascript/i18n/phonenumbers/shortnumbermetadata.js
@@ -890,7 +890,7 @@ i18n.phonenumbers.shortnumbermetadata.countryToMetadata = {
 ]
 ,,,,"DK",,,,,,,,,,,,,,,,,,[,,"11[24]",,,,"112",,,[3]
 ]
-,,[,,"1(?:1(?:[2-48]|6(?:00[06]|111))|619[0-2]|8(?:01|1[0238]|28|30|5[13]|8[18]))",,,,"112"]
+,,[,,"1(?:1(?:[248]|6(?:00[06]|111))|619[0-2]|8(?:01|1[0238]|28|30|5[13]|8[18]))",,,,"112"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]

diff --git a/metadata/metadata.zip b/metadata/metadata.zip
diff --git a/release_notes.txt b/release_notes.txt
@@ -1,3 +1,13 @@
+Dec 11, 2024: v8.13.52
+Metadata changes:
+ - Updated phone metadata for region code(s):
+   CA, DE, DK, IL, JP, KY, MN, UG, US, UZ
+ - Updated short number metadata for region code(s): DK
+ - Updated geocoding data for country calling code(s): 86 (en, zh), 1345 (en)
+ - Updated carrier data for country calling code(s):
+   45 (en), 229 (en), 972 (en), 976 (en)
+ - Updated / refreshed time zone meta data.
+
 Nov 28, 2024: v8.13.51
 Code changes:
  - Reverted the std:: qualifier to string throughout phonenumberutil.