Skip to content

Commit 0fd973c

Browse files
authored
Merge branch 'master' into master
2 parents ec9ae61 + eb75813 commit 0fd973c

File tree

82 files changed

+24768
-24713
lines changed

Some content is hidden

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

82 files changed

+24768
-24713
lines changed

.github/workflows/osv-scanner-unified.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
scan-scheduled:
3636
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
3737
# If you want to copy this config, highly suggest pinning this version to a release rather than tracking the main branch
38-
uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
38+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
3939
with:
4040
# Just scan the root directory and docs, since everything else is fixtures
4141
scan-args: |-
@@ -45,7 +45,7 @@ jobs:
4545
scan-pr:
4646
if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
4747
# If you want to copy this config, highly suggest pinning this version to a release rather than tracking the main branch
48-
uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
48+
uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
4949
with:
5050
# Just scan the root directory and docs, since everything else is fixtures
5151
scan-args: |-

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.53.
58+
Last demo update: v8.13.55.
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: 11228 additions & 11225 deletions
Large diffs are not rendered by default.

cpp/src/phonenumbers/metadata.cc

Lines changed: 12066 additions & 12063 deletions
Large diffs are not rendered by default.

cpp/src/phonenumbers/short_metadata.cc

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

java/carrier/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>carrier</artifactId>
5-
<version>1.238-SNAPSHOT</version>
5+
<version>1.240-SNAPSHOT</version>
66
<packaging>jar</packaging>
77
<url>https://github.com/google/libphonenumber/</url>
88

99
<parent>
1010
<groupId>com.googlecode.libphonenumber</groupId>
1111
<artifactId>libphonenumber-parent</artifactId>
12-
<version>8.13.54-SNAPSHOT</version>
12+
<version>8.13.56-SNAPSHOT</version>
1313
</parent>
1414

1515
<build>
@@ -81,12 +81,12 @@
8181
<dependency>
8282
<groupId>com.googlecode.libphonenumber</groupId>
8383
<artifactId>libphonenumber</artifactId>
84-
<version>8.13.54-SNAPSHOT</version>
84+
<version>8.13.56-SNAPSHOT</version>
8585
</dependency>
8686
<dependency>
8787
<groupId>com.googlecode.libphonenumber</groupId>
8888
<artifactId>prefixmapper</artifactId>
89-
<version>2.248-SNAPSHOT</version>
89+
<version>2.250-SNAPSHOT</version>
9090
</dependency>
9191
</dependencies>
9292

Binary file not shown.
-20 Bytes
Binary file not shown.
-1 Bytes
Binary file not shown.
6 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)