diff options
| author | Narayan Kamath <narayan@google.com> | 2015-04-07 11:46:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-07 11:46:35 +0000 |
| commit | 52e2840e86facf8cd64e032fb1d8c70d071f653a (patch) | |
| tree | 0e3807a493a1e6d8eca81968bfba60680dd0bf90 | |
| parent | 702f3052c7c4f44bd1362bad9831ec33d7a42519 (diff) | |
| parent | 0cf4daa9378769e13b7615f6f4f607b8a1a30fd1 (diff) | |
| download | libphonenumber-marshmallow-dr-release.tar.gz | |
am 0cf4daa9: Merge "Update libphonenumber to v7.0.4"android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1afw-test-harness-1.5marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release
* commit '0cf4daa9378769e13b7615f6f4f607b8a1a30fd1':
Update libphonenumber to v7.0.4
51 files changed, 55 insertions, 32 deletions
diff --git a/carrier/pom.xml b/carrier/pom.xml index 2415ac0f..8d4f48c5 100644 --- a/carrier/pom.xml +++ b/carrier/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.9</version> + <version>1.10</version> <packaging>jar</packaging> - <url>http://code.google.com/p/libphonenumber/</url> + <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.2</version> + <version>7.0.4</version> </parent> <build> @@ -34,12 +34,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.2</version> + <version>7.0.4</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.19</version> + <version>2.20</version> </dependency> </dependencies> diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en Binary files differindex 0bcd97a3..3a61f8e0 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en Binary files differindex 4d541b0e..5f54fae7 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en Binary files differindex f1714cca..5aa76bd7 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en Binary files differindex 70c7f64a..4d6864bc 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en Binary files differindex 98ef66b3..51bed889 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en Binary files differindex f1aca7ed..afc862ca 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en Binary files differindex a50573a1..0a4e1d0d 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en diff --git a/demo/pom.xml b/demo/pom.xml index bf938dfe..7ec9fede 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -4,11 +4,11 @@ <parent> <artifactId>libphonenumber-parent</artifactId> <groupId>com.googlecode.libphonenumber</groupId> - <version>7.0.2</version> + <version>7.0.4</version> </parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>demo</artifactId> - <version>7.0.2</version> + <version>7.0.4</version> <properties> <gae.version>1.5.4</gae.version> @@ -43,17 +43,17 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.2</version> + <version>7.0.4</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.19</version> + <version>2.20</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.9</version> + <version>1.10</version> </dependency> </dependencies> diff --git a/demo/war/phonenumberparser.jsp b/demo/war/phonenumberparser.jsp index e40ca55a..63de010f 100644 --- a/demo/war/phonenumberparser.jsp +++ b/demo/war/phonenumberparser.jsp @@ -33,7 +33,7 @@ <input type="submit" value="Submit"> <input type="reset" value="Reset"> <p></p> - <a href="http://code.google.com/p/libphonenumber/">Back to libphonenumber</a> + <a href="https://github.com/googlei18n/libphonenumber/">Back to libphonenumber</a> </form> </body> </html> diff --git a/geocoder/pom.xml b/geocoder/pom.xml index 613e97e4..a8805c13 100644 --- a/geocoder/pom.xml +++ b/geocoder/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.19</version> + <version>2.20</version> <packaging>jar</packaging> - <url>http://code.google.com/p/libphonenumber/</url> + <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.2</version> + <version>7.0.4</version> </parent> <build> @@ -42,12 +42,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.2</version> + <version>7.0.4</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.19</version> + <version>2.20</version> </dependency> </dependencies> diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1220_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1220_en Binary files differnew file mode 100644 index 00000000..9f2bd2a1 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1220_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en Binary files differindex b08761e0..a7dfe647 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en Binary files differindex fe31ca94..e253749f 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en Binary files differindex 6e4ea08d..4feb4c75 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en Binary files differindex b0540cc8..736eb7de 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1628_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1628_en Binary files differnew file mode 100644 index 00000000..e4651f02 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1628_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1629_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1629_en Binary files differnew file mode 100644 index 00000000..cd009f15 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1629_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en Binary files differindex cf175f9d..ecebe325 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en Binary files differnew file mode 100644 index 00000000..c347a2aa --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en Binary files differindex 8fd663bf..ebbda295 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh Binary files differindex 406d8511..db537eb9 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config Binary files differindex df72e10c..5d30fd41 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config diff --git a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data Binary files differindex aa574da0..26c66a57 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data +++ b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data diff --git a/internal/prefixmapper/pom.xml b/internal/prefixmapper/pom.xml index 4d64b187..55e14f59 100644 --- a/internal/prefixmapper/pom.xml +++ b/internal/prefixmapper/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.19</version> + <version>2.20</version> <packaging>jar</packaging> - <url>http://code.google.com/p/libphonenumber/</url> + <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.2</version> + <version>7.0.4</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.2</version> + <version>7.0.4</version> </dependency> </dependencies> diff --git a/libphonenumber/pom.xml b/libphonenumber/pom.xml index 09b14d2c..21cd7355 100644 --- a/libphonenumber/pom.xml +++ b/libphonenumber/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.2</version> + <version>7.0.4</version> <packaging>jar</packaging> - <url>http://code.google.com/p/libphonenumber/</url> + <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.2</version> + <version>7.0.4</version> </parent> <build> diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java index ad63a40a..456c8eda 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java @@ -390,6 +390,9 @@ public class AsYouTypeFormatter { ableToFormat = true; isExpectingCountryCallingCode = false; possibleFormats.clear(); + lastMatchPosition = 0; + formattingTemplate.setLength(0); + currentFormattingPattern = ""; return attemptToChooseFormattingPattern(); } @@ -637,6 +640,8 @@ public class AsYouTypeFormatter { } private String inputDigitHelper(char nextChar) { + // Note that formattingTemplate is not guaranteed to have a value, it could be empty, e.g. + // when the next digit is entered after extracting an IDD or NDD. Matcher digitMatcher = DIGIT_PATTERN.matcher(formattingTemplate); if (digitMatcher.find(lastMatchPosition)) { String tempTemplate = digitMatcher.replaceFirst(Character.toString(nextChar)); diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR Binary files differindex b9a27fdc..dc775bb8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH Binary files differindex 6d37f636..4ccb0597 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY Binary files differindex c1be2b9d..bf010acb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA Binary files differindex b92641f6..395baf20 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI Binary files differindex 972c334d..880fb253 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN Binary files differindex ed06d7c9..f09a6019 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH Binary files differindex b237efb6..410c1b46 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU Binary files differindex 0da84020..1241b496 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL Binary files differindex afe40ac5..156bed9a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO Binary files differindex e2ff6b93..85bd447f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR Binary files differindex 9e587ee0..200201ea 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW Binary files differindex 19da153e..27ffde34 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU Binary files differindex 466bea59..c7bb66fe 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME Binary files differindex cdcb96db..1fe1d4d6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ Binary files differindex ca431407..b980f3ff 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB Binary files differindex bfd2828e..d063ccf9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG Binary files differindex 9204ad9f..49bd8d0c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL Binary files differindex f5d38fcd..307391e5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US Binary files differindex e8d8683c..cee870e8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS Binary files differindex 02cced67..fb630c2e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI Binary files differindex a0eacfdf..3ed554e6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java index 3461a826..75977a0d 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java @@ -66,7 +66,7 @@ public class AsYouTypeFormatterTest extends TestMetadataTestCase { } public void testTooLongNumberMatchingMultipleLeadingDigits() { - // See http://code.google.com/p/libphonenumber/issues/detail?id=36 + // See https://github.com/googlei18n/libphonenumber/issues/36 // The bug occurred last time for countries which have two formatting rules with exactly the // same leading digits pattern but differ in length. AsYouTypeFormatter formatter = phoneUtil.getAsYouTypeFormatter(RegionCode.ZZ); @@ -1164,7 +1164,7 @@ public class AsYouTypeFormatterTest extends TestMetadataTestCase { // when we try again to extract a country code we should ensure we use the last leading digit // pattern, rather than the first one such that it *thinks* it's found a valid formatting rule // again. - // https://code.google.com/p/libphonenumber/issues/detail?id=437 + // https://github.com/googlei18n/libphonenumber/issues/437 assertEquals("+8698812", formatter.inputDigit('2')); assertEquals("+86988123", formatter.inputDigit('3')); assertEquals("+869881234", formatter.inputDigit('4')); @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.1</version> + <version>7.0.4</version> <packaging>pom</packaging> - <url>http://code.google.com/p/libphonenumber/</url> + <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>org.sonatype.oss</groupId> @@ -31,9 +31,9 @@ </licenses> <scm> - <connection>scm:svn:http://libphonenumber.googlecode.com/svn/tags/libphonenumber-7.0.1</connection> - <developerConnection>scm:svn:https://libphonenumber.googlecode.com/svn/tags/libphonenumber-7.0.1</developerConnection> - <url>scm:svn:http://libphonenumber.googlecode.com/svn/tags/libphonenumber-7.0.1</url> + <connection>scm:git:https://github.com/googlei18n/libphonenumber.git</connection> + <developerConnection>scm:git:git@github.com:googlei18n/libphonenumber.git</developerConnection> + <url>https://github.com/googlei18n/libphonenumber/</url> </scm> <properties> @@ -128,7 +128,6 @@ <artifactId>maven-release-plugin</artifactId> <version>2.2.1</version> <configuration> - <tagBase>https://libphonenumber.googlecode.com/svn/tags/</tagBase> <tagNameFormat>libphonenumber-@{project.version}</tagNameFormat> </configuration> </plugin> diff --git a/release_notes.txt b/release_notes.txt index 1db5019d..2d4aead5 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,22 @@ +Mar 25, 2015: libphonenumber-7.0.4 +* Metadata changes: + - Updated phone metadata for region code(s): CA, HU, IL, JO, LU, SG, SL, US + - Updated short number metadata for region code(s): BI + - New geocoding data for country calling code(s): + 1220 (en), 1628 (en), 1629 (en) + - Updated carrier data for country calling code(s): + 65 (en), 232 (en), 972 (en) + +Mar 02, 2015: libphonenumber-7.0.3 +* Metadata changes: + - Updated phone metadata for region code(s): + AR, BH, BY, CI, CN, GH, KR, KW, LU, ME, NZ, SB, WS + - New geocoding data for country calling code(s): 64 (en) + - Updated geocoding data for country calling code(s): + 86 (en, zh), 1418 (en), 1438 (en), 1450 (en), 1514 (en), 1819 (en) + - Updated carrier data for country calling code(s): + 225 (en), 233 (en), 677 (en), 973 (en) + Jan 09, 2015: libphonenumber-7.0.2 * Metadata changes: - Updated phone metadata for region code(s): @@ -430,7 +449,7 @@ Oct 10, 2012: libphonenumber-5.2 - Adds isNumberGeographical() method. - Adds getRegionCodesForCountryCode() method. - Fixing issue with getSupportedGlobalNetworkCallingCodes() - [http://code.google.com/p/libphonenumber/issues/detail?id=202] + [https://github.com/googlei18n/libphonenumber/issues/202] - Ensures that returned collections are unmodifiable where necessary [there is a very slight risk that this may break existing users who were relying on being able to modify these collections, but doing so would be breaking lots of other assumptions that this |