From 688767838d41089d011da7470f64ce700c634d51 Mon Sep 17 00:00:00 2001 From: ezathashim Date: Thu, 26 Apr 2018 08:19:54 -0400 Subject: [PATCH 1/2] - changed the product names to standard libPhoneNumber no matter what target - added modulemap files - not sure if it is better to name the actual product 'libPhoneNumber' or just set the module name to 'libPhoneNumber' --- libPhoneNumber-iOS/iOS_module.modulemap | 6 +++ libPhoneNumber-macOS/macOS_module.modulemap | 6 +++ libPhoneNumber-tvOS/tvOS_module.modulemap | 6 +++ .../watchOS_module.modulemap | 6 +++ libPhoneNumber.xcodeproj/project.pbxproj | 52 +++++++++++-------- .../xcschemes/libPhoneNumberiOS.xcscheme | 10 ++-- .../xcschemes/libPhoneNumbermacOS.xcscheme | 8 ++- .../xcschemes/libPhoneNumbertvOS.xcscheme | 8 ++- .../xcschemes/libPhoneNumberwatchOS.xcscheme | 8 ++- 9 files changed, 67 insertions(+), 43 deletions(-) create mode 100755 libPhoneNumber-iOS/iOS_module.modulemap create mode 100755 libPhoneNumber-macOS/macOS_module.modulemap create mode 100755 libPhoneNumber-tvOS/tvOS_module.modulemap create mode 100755 libPhoneNumber-watchOS/watchOS_module.modulemap diff --git a/libPhoneNumber-iOS/iOS_module.modulemap b/libPhoneNumber-iOS/iOS_module.modulemap new file mode 100755 index 00000000..e39c2a4b --- /dev/null +++ b/libPhoneNumber-iOS/iOS_module.modulemap @@ -0,0 +1,6 @@ +framework module libPhoneNumber { + umbrella header "libPhoneNumberiOS.h" + + export * + module * { export * } +} diff --git a/libPhoneNumber-macOS/macOS_module.modulemap b/libPhoneNumber-macOS/macOS_module.modulemap new file mode 100755 index 00000000..8cb596e9 --- /dev/null +++ b/libPhoneNumber-macOS/macOS_module.modulemap @@ -0,0 +1,6 @@ +framework module libPhoneNumber { + umbrella header "libPhoneNumbermacOS.h" + + export * + module * { export * } +} diff --git a/libPhoneNumber-tvOS/tvOS_module.modulemap b/libPhoneNumber-tvOS/tvOS_module.modulemap new file mode 100755 index 00000000..880c1a51 --- /dev/null +++ b/libPhoneNumber-tvOS/tvOS_module.modulemap @@ -0,0 +1,6 @@ +framework module libPhoneNumber { + umbrella header "libPhoneNumbertvOS.h" + + export * + module * { export * } +} diff --git a/libPhoneNumber-watchOS/watchOS_module.modulemap b/libPhoneNumber-watchOS/watchOS_module.modulemap new file mode 100755 index 00000000..a126a050 --- /dev/null +++ b/libPhoneNumber-watchOS/watchOS_module.modulemap @@ -0,0 +1,6 @@ +framework module libPhoneNumber { + umbrella header "libPhoneNumberwatchOS.h" + + export * + module * { export * } +} diff --git a/libPhoneNumber.xcodeproj/project.pbxproj b/libPhoneNumber.xcodeproj/project.pbxproj index 4529dce5..b873d35f 100755 --- a/libPhoneNumber.xcodeproj/project.pbxproj +++ b/libPhoneNumber.xcodeproj/project.pbxproj @@ -149,7 +149,7 @@ 8B0FD3031E4A88AC0049DF81 /* NSArray+NBAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B0FD2FA1E4A88AC0049DF81 /* NSArray+NBAdditions.m */; }; 8B0FD3041E4A88AC0049DF81 /* NSArray+NBAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B0FD2FA1E4A88AC0049DF81 /* NSArray+NBAdditions.m */; }; 8B1FEF981EB7BEFE00FBDE87 /* NBTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B1FEF971EB7BEFE00FBDE87 /* NBTextField.swift */; }; - 8B1FEF9B1EB7BF3200FBDE87 /* libPhoneNumberiOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34ACBB851B7122AC0064B3BD /* libPhoneNumberiOS.framework */; }; + 8B1FEF9B1EB7BF3200FBDE87 /* libPhoneNumber.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34ACBB851B7122AC0064B3BD /* libPhoneNumber.framework */; }; 8B1FEF9C1EB7BF6900FBDE87 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6AE8F81BEE72B600263DE1 /* AppDelegate.swift */; }; 8B1FEF9D1EB7BF6C00FBDE87 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD6AE8FA1BEE72B600263DE1 /* ViewController.swift */; }; 8B1FEF9E1EB7BF7000FBDE87 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FD6AE8FC1BEE72B600263DE1 /* Main.storyboard */; }; @@ -199,18 +199,18 @@ 14B7A2D11DE9D7F70051AED7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 187A618A1A25DF04000D8BB6 /* PhoneNumberMetaData.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = PhoneNumberMetaData.json; path = libPhoneNumberTests/generatedJSON/PhoneNumberMetaData.json; sourceTree = SOURCE_ROOT; }; 187A618B1A25DF04000D8BB6 /* PhoneNumberMetaDataForTesting.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = PhoneNumberMetaDataForTesting.json; path = libPhoneNumberTests/generatedJSON/PhoneNumberMetaDataForTesting.json; sourceTree = SOURCE_ROOT; }; - 1F31D52A1DDD46B100257818 /* libPhoneNumberwatchOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libPhoneNumberwatchOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1F31D52A1DDD46B100257818 /* libPhoneNumber.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libPhoneNumber.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1F31D52C1DDD46B100257818 /* libPhoneNumberwatchOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libPhoneNumberwatchOS.h; sourceTree = ""; }; 1F31D52D1DDD46B100257818 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 1F31D54D1DDD47B900257818 /* libPhoneNumbertvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libPhoneNumbertvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1F31D54D1DDD47B900257818 /* libPhoneNumber.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libPhoneNumber.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1F31D54F1DDD47BA00257818 /* libPhoneNumbertvOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libPhoneNumbertvOS.h; sourceTree = ""; }; 1F31D5501DDD47BA00257818 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 29F3A15C17B98AE1005D8E07 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; - 34ACBB851B7122AC0064B3BD /* libPhoneNumberiOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libPhoneNumberiOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 34ACBB851B7122AC0064B3BD /* libPhoneNumber.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libPhoneNumber.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 34ACBB881B7122AC0064B3BD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = "libPhoneNumber-iOS/Info.plist"; sourceTree = ""; }; 34ACBB891B7122AC0064B3BD /* libPhoneNumberiOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = libPhoneNumberiOS.h; path = "libPhoneNumber-iOS/libPhoneNumberiOS.h"; sourceTree = ""; }; 4D43EF831740825100C24FF3 /* libPhoneNumber-iOS.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libPhoneNumber-iOS.podspec"; sourceTree = SOURCE_ROOT; }; - 7C72507C1E0EBE7D00F916ED /* libPhoneNumbermacOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libPhoneNumbermacOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7C72507C1E0EBE7D00F916ED /* libPhoneNumber.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libPhoneNumber.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7C72507E1E0EBE7D00F916ED /* libPhoneNumbermacOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libPhoneNumbermacOS.h; sourceTree = ""; }; 7C72507F1E0EBE7D00F916ED /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8B0FD2E61E4A846F0049DF81 /* GeneratePhoneNumberHeader.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = GeneratePhoneNumberHeader.sh; sourceTree = ""; }; @@ -305,7 +305,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8B1FEF9B1EB7BF3200FBDE87 /* libPhoneNumberiOS.framework in Frameworks */, + 8B1FEF9B1EB7BF3200FBDE87 /* libPhoneNumber.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -487,12 +487,12 @@ FD7A061D167715A0004BBEB6 /* Products */ = { isa = PBXGroup; children = ( - 34ACBB851B7122AC0064B3BD /* libPhoneNumberiOS.framework */, - 1F31D52A1DDD46B100257818 /* libPhoneNumberwatchOS.framework */, - 1F31D54D1DDD47B900257818 /* libPhoneNumbertvOS.framework */, + 34ACBB851B7122AC0064B3BD /* libPhoneNumber.framework */, + 1F31D52A1DDD46B100257818 /* libPhoneNumber.framework */, + 1F31D54D1DDD47B900257818 /* libPhoneNumber.framework */, 14B7A2931DE9B65D0051AED7 /* libPhoneNumberiOSTests.xctest */, 14B7A2BE1DE9D7F60051AED7 /* MetadataGenerator.app */, - 7C72507C1E0EBE7D00F916ED /* libPhoneNumbermacOS.framework */, + 7C72507C1E0EBE7D00F916ED /* libPhoneNumber.framework */, 8B1FEF731EB7BE7C00FBDE87 /* SwiftDemo.app */, ); name = Products; @@ -683,7 +683,7 @@ ); name = libPhoneNumberwatchOS; productName = "libPhoneNumber-watchOS"; - productReference = 1F31D52A1DDD46B100257818 /* libPhoneNumberwatchOS.framework */; + productReference = 1F31D52A1DDD46B100257818 /* libPhoneNumber.framework */; productType = "com.apple.product-type.framework"; }; 1F31D54C1DDD47B900257818 /* libPhoneNumbertvOS */ = { @@ -701,7 +701,7 @@ ); name = libPhoneNumbertvOS; productName = "libPhoneNumber-tvOS"; - productReference = 1F31D54D1DDD47B900257818 /* libPhoneNumbertvOS.framework */; + productReference = 1F31D54D1DDD47B900257818 /* libPhoneNumber.framework */; productType = "com.apple.product-type.framework"; }; 34ACBB841B7122AC0064B3BD /* libPhoneNumberiOS */ = { @@ -719,7 +719,7 @@ ); name = libPhoneNumberiOS; productName = "libPhoneNumber-iOS"; - productReference = 34ACBB851B7122AC0064B3BD /* libPhoneNumberiOS.framework */; + productReference = 34ACBB851B7122AC0064B3BD /* libPhoneNumber.framework */; productType = "com.apple.product-type.framework"; }; 7C72507B1E0EBE7D00F916ED /* libPhoneNumbermacOS */ = { @@ -737,7 +737,7 @@ ); name = libPhoneNumbermacOS; productName = libPhoneNumbermacOS; - productReference = 7C72507C1E0EBE7D00F916ED /* libPhoneNumbermacOS.framework */; + productReference = 7C72507C1E0EBE7D00F916ED /* libPhoneNumber.framework */; productType = "com.apple.product-type.framework"; }; 8B1FEF721EB7BE7C00FBDE87 /* SwiftDemo */ = { @@ -1198,9 +1198,10 @@ INFOPLIST_FILE = "libPhoneNumber-watchOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "${SRCROOT}/libPhoneNumber-watchOS/watchOS_module.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = me.ohtalk.libPhoneNumber.watchOS; - PRODUCT_NAME = libPhoneNumberwatchOS; + PRODUCT_NAME = libPhoneNumber; SDKROOT = watchos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; @@ -1244,9 +1245,10 @@ INFOPLIST_FILE = "libPhoneNumber-watchOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "${SRCROOT}/libPhoneNumber-watchOS/watchOS_module.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = me.ohtalk.libPhoneNumber.watchOS; - PRODUCT_NAME = libPhoneNumberwatchOS; + PRODUCT_NAME = libPhoneNumber; SDKROOT = watchos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; @@ -1288,9 +1290,10 @@ INFOPLIST_FILE = "libPhoneNumber-tvOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "${SRCROOT}/libPhoneNumber-tvOS/tvOS_module.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = me.ohtalk.libPhoneNumber.tvOS; - PRODUCT_NAME = libPhoneNumbertvOS; + PRODUCT_NAME = libPhoneNumber; SDKROOT = appletvos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 3; @@ -1334,9 +1337,10 @@ INFOPLIST_FILE = "libPhoneNumber-tvOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "${SRCROOT}/libPhoneNumber-tvOS/tvOS_module.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = me.ohtalk.libPhoneNumber.tvOS; - PRODUCT_NAME = libPhoneNumbertvOS; + PRODUCT_NAME = libPhoneNumber; SDKROOT = appletvos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 3; @@ -1379,10 +1383,11 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "${SRCROOT}/libPhoneNumber-iOS/iOS_module.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = me.ohtalk.libPhoneNumber.iOS; - PRODUCT_NAME = libPhoneNumberiOS; + PRODUCT_NAME = libPhoneNumber; SKIP_INSTALL = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1420,10 +1425,11 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "${SRCROOT}/libPhoneNumber-iOS/iOS_module.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = me.ohtalk.libPhoneNumber.iOS; - PRODUCT_NAME = libPhoneNumberiOS; + PRODUCT_NAME = libPhoneNumber; SKIP_INSTALL = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1453,9 +1459,10 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; + MODULEMAP_FILE = "${SRCROOT}/libPhoneNumber-macOS/macOS_module.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = me.ohtalk.libPhoneNumber.macOS; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = libPhoneNumber; SDKROOT = macosx; SKIP_INSTALL = YES; VALID_ARCHS = "i386 x86_64"; @@ -1489,9 +1496,10 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; + MODULEMAP_FILE = "${SRCROOT}/libPhoneNumber-macOS/macOS_module.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = me.ohtalk.libPhoneNumber.macOS; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = libPhoneNumber; SDKROOT = macosx; SKIP_INSTALL = YES; VALID_ARCHS = "i386 x86_64"; diff --git a/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumberiOS.xcscheme b/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumberiOS.xcscheme index bf4ec72e..edc06d4e 100644 --- a/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumberiOS.xcscheme +++ b/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumberiOS.xcscheme @@ -15,7 +15,7 @@ @@ -26,7 +26,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -56,7 +55,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -67,7 +65,7 @@ @@ -85,7 +83,7 @@ diff --git a/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumbermacOS.xcscheme b/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumbermacOS.xcscheme index 4481f070..c95dd7c6 100644 --- a/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumbermacOS.xcscheme +++ b/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumbermacOS.xcscheme @@ -15,7 +15,7 @@ @@ -26,7 +26,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -48,7 +46,7 @@ @@ -66,7 +64,7 @@ diff --git a/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumbertvOS.xcscheme b/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumbertvOS.xcscheme index c2bcca6b..5a8dcfe2 100644 --- a/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumbertvOS.xcscheme +++ b/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumbertvOS.xcscheme @@ -15,7 +15,7 @@ @@ -26,7 +26,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -48,7 +46,7 @@ @@ -66,7 +64,7 @@ diff --git a/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumberwatchOS.xcscheme b/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumberwatchOS.xcscheme index 137550ee..dd469513 100644 --- a/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumberwatchOS.xcscheme +++ b/libPhoneNumber.xcodeproj/xcshareddata/xcschemes/libPhoneNumberwatchOS.xcscheme @@ -15,7 +15,7 @@ @@ -26,7 +26,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -48,7 +46,7 @@ @@ -66,7 +64,7 @@ From 927cd2fabc143791c1f8c05eabbe07a7bb464351 Mon Sep 17 00:00:00 2001 From: ezathashim Date: Sun, 9 May 2021 22:06:34 -0400 Subject: [PATCH 2/2] =?UTF-8?q?Renamed=20=E2=80=98NBPhoneNumberUtil.h?= =?UTF-8?q?=E2=80=99=20to=20=E2=80=98NBPhoneNumberUtilility=E2=80=99=20bec?= =?UTF-8?q?ause=20there=20is=20a=20private=20Apple=20API=20called=20?= =?UTF-8?q?=E2=80=98NBPhoneNumberUtil=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MetadataGenerator/AppDelegate.m | 12 +-- libPhoneNumber-iOS.podspec | 2 +- libPhoneNumber-iOS/NBTextField.swift | 2 +- libPhoneNumber-iOS/libPhoneNumberiOS.h | 2 +- libPhoneNumber-macOS/libPhoneNumbermacOS.h | 2 +- libPhoneNumber-tvOS/libPhoneNumbertvOS.h | 2 +- .../libPhoneNumberwatchOS.h | 2 +- libPhoneNumber.xcodeproj/project.pbxproj | 85 ++++++++++--------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ libPhoneNumber/Internal/NBRegExMatcher.m | 8 +- libPhoneNumber/NBAsYouTypeFormatter.m | 6 +- ...r.h => NBPhoneNumberUtility+ShortNumber.h} | 6 +- ...r.m => NBPhoneNumberUtility+ShortNumber.m} | 10 +-- ...oneNumberUtil.h => NBPhoneNumberUtility.h} | 6 +- ...oneNumberUtil.m => NBPhoneNumberUtility.m} | 14 +-- .../NBPhoneNumberParsingPerfTest.m | 4 +- .../NBPhoneNumberUtil+ShortNumberTestHelper.h | 10 +-- .../NBPhoneNumberUtil+ShortNumberTestHelper.m | 8 +- libPhoneNumberTests/NBPhoneNumberUtilTest.m | 8 +- libPhoneNumberTests/NBShortNumberInfoTest.m | 60 ++++++------- 20 files changed, 133 insertions(+), 124 deletions(-) create mode 100644 libPhoneNumber.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename libPhoneNumber/{NBPhoneNumberUtil+ShortNumber.h => NBPhoneNumberUtility+ShortNumber.h} (98%) rename libPhoneNumber/{NBPhoneNumberUtil+ShortNumber.m => NBPhoneNumberUtility+ShortNumber.m} (97%) rename libPhoneNumber/{NBPhoneNumberUtil.h => NBPhoneNumberUtility.h} (98%) rename libPhoneNumber/{NBPhoneNumberUtil.m => NBPhoneNumberUtility.m} (99%) diff --git a/MetadataGenerator/AppDelegate.m b/MetadataGenerator/AppDelegate.m index d104020a..c4236d03 100644 --- a/MetadataGenerator/AppDelegate.m +++ b/MetadataGenerator/AppDelegate.m @@ -30,7 +30,7 @@ - (BOOL)application:(UIApplication *)application } - (void)testForGetSupportedRegions { - NBPhoneNumberUtil *phoneUtil = [NBPhoneNumberUtil sharedInstance]; + NBPhoneNumberUtility *phoneUtil = [NBPhoneNumberUtility sharedInstance]; NSLog(@"%@", [phoneUtil getSupportedRegions]); } @@ -69,7 +69,7 @@ - (void)testWithRealData { // Unit test for isValidNumber is failing some valid numbers. #7 - NBPhoneNumberUtil *phoneUtil = [NBPhoneNumberUtil sharedInstance]; + NBPhoneNumberUtility *phoneUtil = [NBPhoneNumberUtility sharedInstance]; { NSError *error = nil; @@ -215,7 +215,7 @@ - (NSString *)randomRegion { } - (void)testForMultithread { - NBPhoneNumberUtil *aUtil = [NBPhoneNumberUtil sharedInstance]; + NBPhoneNumberUtility *aUtil = [NBPhoneNumberUtility sharedInstance]; NSString *testRegion = [self randomRegion]; if (!testRegion) { @@ -269,7 +269,7 @@ - (void)testCarrierRegion { } - (NSString *)getPhoneNumberFormatted:(NSString *)phoneNumber { - NBPhoneNumberUtil *phoneUtil = [NBPhoneNumberUtil sharedInstance]; + NBPhoneNumberUtility *phoneUtil = [NBPhoneNumberUtility sharedInstance]; NSString *retValue; NBPhoneNumber *phoneNumberFormatted = [phoneUtil parseWithPhoneCarrierRegion:phoneNumber error:nil]; @@ -280,7 +280,7 @@ - (NSString *)getPhoneNumberFormatted:(NSString *)phoneNumber { // FIXME: This unit test ALWAYS FAIL ... until google libPhoneNumber fix this issue - (void)testAustriaNationalNumberParsing { - NBPhoneNumberUtil *phoneUtil = [NBPhoneNumberUtil sharedInstance]; + NBPhoneNumberUtility *phoneUtil = [NBPhoneNumberUtility sharedInstance]; NSError *anError = nil; @@ -297,7 +297,7 @@ - (void)testAustriaNationalNumberParsing { } - (void)testForiOS7 { - NBPhoneNumberUtil *phoneUtil = [NBPhoneNumberUtil sharedInstance]; + NBPhoneNumberUtility *phoneUtil = [NBPhoneNumberUtility sharedInstance]; NSError *anError = nil; NBPhoneNumber *myNumber = [phoneUtil parse:@"0174 2340XXX" defaultRegion:@"DE" error:&anError]; diff --git a/libPhoneNumber-iOS.podspec b/libPhoneNumber-iOS.podspec index ffcf17f5..c81ee1f7 100755 --- a/libPhoneNumber-iOS.podspec +++ b/libPhoneNumber-iOS.podspec @@ -18,5 +18,5 @@ DESC s.tvos.deployment_target = "9.0" s.requires_arc = true s.private_header_files = 'libPhoneNumber/NBGeneratedPhoneNumberMetaData.h' - s.source_files = 'libPhoneNumber/NBPhoneNumberDefines.{h,m}', 'libPhoneNumber/NBPhoneNumber.{h,m}', 'libPhoneNumber/NBNumberFormat.{h,m}', 'libPhoneNumber/NBPhoneNumberDesc.{h,m}', 'libPhoneNumber/NBPhoneMetaData.{h,m}', 'libPhoneNumber/NBPhoneNumberUtil.{h,m}', 'libPhoneNumber/NBMetadataHelper.{h,m}', 'libPhoneNumber/NBAsYouTypeFormatter.{h,m}', 'libPhoneNumber/NSArray+NBAdditions.{h,m}', 'libPhoneNumber/NBGeneratedPhoneNumberMetaData.h' + s.source_files = 'libPhoneNumber/NBPhoneNumberDefines.{h,m}', 'libPhoneNumber/NBPhoneNumber.{h,m}', 'libPhoneNumber/NBNumberFormat.{h,m}', 'libPhoneNumber/NBPhoneNumberDesc.{h,m}', 'libPhoneNumber/NBPhoneMetaData.{h,m}', 'libPhoneNumber/NBPhoneNumberUtility.{h,m}', 'libPhoneNumber/NBMetadataHelper.{h,m}', 'libPhoneNumber/NBAsYouTypeFormatter.{h,m}', 'libPhoneNumber/NSArray+NBAdditions.{h,m}', 'libPhoneNumber/NBGeneratedPhoneNumberMetaData.h' end diff --git a/libPhoneNumber-iOS/NBTextField.swift b/libPhoneNumber-iOS/NBTextField.swift index c6cf767c..3a0d2611 100644 --- a/libPhoneNumber-iOS/NBTextField.swift +++ b/libPhoneNumber-iOS/NBTextField.swift @@ -13,7 +13,7 @@ open class NBTextField: UITextField { // MARK: Options/Variables for phone number formatting - let phoneNumberUtility: NBPhoneNumberUtil = NBPhoneNumberUtil() + let phoneNumberUtility: NBPhoneNumberUtility = NBPhoneNumberUtility() var phoneNumberFormatter: NBAsYouTypeFormatter? var shouldCheckValidationForInputText: Bool = true diff --git a/libPhoneNumber-iOS/libPhoneNumberiOS.h b/libPhoneNumber-iOS/libPhoneNumberiOS.h index ca4274ab..cef56bce 100644 --- a/libPhoneNumber-iOS/libPhoneNumberiOS.h +++ b/libPhoneNumber-iOS/libPhoneNumberiOS.h @@ -21,7 +21,7 @@ FOUNDATION_EXPORT const unsigned char libPhoneNumber_iOSVersionString[]; // Features #import "NBAsYouTypeFormatter.h" -#import "NBPhoneNumberUtil.h" +#import "NBPhoneNumberUtility.h" // Metadata #import "NBMetadataHelper.h" diff --git a/libPhoneNumber-macOS/libPhoneNumbermacOS.h b/libPhoneNumber-macOS/libPhoneNumbermacOS.h index 589832ec..7d09c04c 100644 --- a/libPhoneNumber-macOS/libPhoneNumbermacOS.h +++ b/libPhoneNumber-macOS/libPhoneNumbermacOS.h @@ -21,7 +21,7 @@ FOUNDATION_EXPORT const unsigned char libPhoneNumbermacOSVersionString[]; // Features #import "NBAsYouTypeFormatter.h" -#import "NBPhoneNumberUtil.h" +#import "NBPhoneNumberUtility.h" // Metadata #import "NBMetadataHelper.h" diff --git a/libPhoneNumber-tvOS/libPhoneNumbertvOS.h b/libPhoneNumber-tvOS/libPhoneNumbertvOS.h index 2891f003..472c0db5 100644 --- a/libPhoneNumber-tvOS/libPhoneNumbertvOS.h +++ b/libPhoneNumber-tvOS/libPhoneNumbertvOS.h @@ -21,7 +21,7 @@ FOUNDATION_EXPORT const unsigned char libPhoneNumber_tvOSVersionString[]; // Features #import "NBAsYouTypeFormatter.h" -#import "NBPhoneNumberUtil.h" +#import "NBPhoneNumberUtility.h" // Metadata #import "NBMetadataCore.h" diff --git a/libPhoneNumber-watchOS/libPhoneNumberwatchOS.h b/libPhoneNumber-watchOS/libPhoneNumberwatchOS.h index fe11e12f..30aeaea0 100644 --- a/libPhoneNumber-watchOS/libPhoneNumberwatchOS.h +++ b/libPhoneNumber-watchOS/libPhoneNumberwatchOS.h @@ -21,7 +21,7 @@ FOUNDATION_EXPORT const unsigned char libPhoneNumber_watchOSVersionString[]; // Features #import "NBAsYouTypeFormatter.h" -#import "NBPhoneNumberUtil.h" +#import "NBPhoneNumberUtility.h" // Metadata #import "NBMetadataCore.h" diff --git a/libPhoneNumber.xcodeproj/project.pbxproj b/libPhoneNumber.xcodeproj/project.pbxproj index b873d35f..71a97a39 100755 --- a/libPhoneNumber.xcodeproj/project.pbxproj +++ b/libPhoneNumber.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 0F2870931FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2870911FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.h */; }; - 0F2870941FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870921FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.m */; }; + 0F2870931FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2870911FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.h */; }; + 0F2870941FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870921FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.m */; }; 0F2870981FCF8F13006230BF /* NBRegExMatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2870961FCF8F13006230BF /* NBRegExMatcher.h */; }; 0F2870991FCF8F13006230BF /* NBRegExMatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2870961FCF8F13006230BF /* NBRegExMatcher.h */; }; 0F28709A1FCF8F13006230BF /* NBRegExMatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2870961FCF8F13006230BF /* NBRegExMatcher.h */; }; @@ -25,11 +25,11 @@ 0F2870A71FCF9368006230BF /* NBRegularExpressionCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870A11FCF9368006230BF /* NBRegularExpressionCache.m */; }; 0F2870A81FCF9368006230BF /* NBRegularExpressionCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870A11FCF9368006230BF /* NBRegularExpressionCache.m */; }; 0F2870A91FCF9368006230BF /* NBRegularExpressionCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870A11FCF9368006230BF /* NBRegularExpressionCache.m */; }; - 0F2870AA1FCF9612006230BF /* NBPhoneNumberUtil+ShortNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870921FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.m */; }; - 0F2870AB1FCF9612006230BF /* NBPhoneNumberUtil+ShortNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870921FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.m */; }; - 0F2870AC1FCF9612006230BF /* NBPhoneNumberUtil+ShortNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870921FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.m */; }; - 0F2870AD1FCF9617006230BF /* NBPhoneNumberUtil+ShortNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870921FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.m */; }; - 0F2870AE1FCF9617006230BF /* NBPhoneNumberUtil+ShortNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870921FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.m */; }; + 0F2870AA1FCF9612006230BF /* NBPhoneNumberUtility+ShortNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870921FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.m */; }; + 0F2870AB1FCF9612006230BF /* NBPhoneNumberUtility+ShortNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870921FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.m */; }; + 0F2870AC1FCF9612006230BF /* NBPhoneNumberUtility+ShortNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870921FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.m */; }; + 0F2870AD1FCF9617006230BF /* NBPhoneNumberUtility+ShortNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870921FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.m */; }; + 0F2870AE1FCF9617006230BF /* NBPhoneNumberUtility+ShortNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870921FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.m */; }; 0F2870AF1FCF961C006230BF /* NBRegExMatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870971FCF8F13006230BF /* NBRegExMatcher.m */; }; 0F2870B01FCF961D006230BF /* NBRegExMatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870971FCF8F13006230BF /* NBRegExMatcher.m */; }; 0F2870B11FCF9620006230BF /* NBRegularExpressionCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F2870A11FCF9368006230BF /* NBRegularExpressionCache.m */; }; @@ -46,7 +46,7 @@ 14B7A2B21DE9BF160051AED7 /* NBPhoneNumberDesc.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84301934C35F00C350EB /* NBPhoneNumberDesc.m */; }; 14B7A2B31DE9BF160051AED7 /* NBPhoneMetaData.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B842B1934C35F00C350EB /* NBPhoneMetaData.m */; }; 14B7A2B41DE9BF160051AED7 /* NBPhoneNumberDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = A81D6A281BECC43A00F68F34 /* NBPhoneNumberDefines.m */; }; - 14B7A2B51DE9BF160051AED7 /* NBPhoneNumberUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84321934C35F00C350EB /* NBPhoneNumberUtil.m */; }; + 14B7A2B51DE9BF160051AED7 /* NBPhoneNumberUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84321934C35F00C350EB /* NBPhoneNumberUtility.m */; }; 14B7A2B61DE9BF160051AED7 /* NBAsYouTypeFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84271934C35F00C350EB /* NBAsYouTypeFormatter.m */; }; 14B7A2C21DE9D7F70051AED7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14B7A2C11DE9D7F70051AED7 /* main.m */; }; 14B7A2C51DE9D7F70051AED7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14B7A2C41DE9D7F70051AED7 /* AppDelegate.m */; }; @@ -60,7 +60,7 @@ 14B7A2DC1DE9D8B30051AED7 /* NBPhoneNumberDesc.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84301934C35F00C350EB /* NBPhoneNumberDesc.m */; }; 14B7A2DD1DE9D8B30051AED7 /* NBPhoneMetaData.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B842B1934C35F00C350EB /* NBPhoneMetaData.m */; }; 14B7A2DE1DE9D8B30051AED7 /* NBPhoneNumberDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = A81D6A281BECC43A00F68F34 /* NBPhoneNumberDefines.m */; }; - 14B7A2DF1DE9D8B30051AED7 /* NBPhoneNumberUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84321934C35F00C350EB /* NBPhoneNumberUtil.m */; }; + 14B7A2DF1DE9D8B30051AED7 /* NBPhoneNumberUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84321934C35F00C350EB /* NBPhoneNumberUtility.m */; }; 14B7A2E01DE9D8B30051AED7 /* NBAsYouTypeFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84271934C35F00C350EB /* NBAsYouTypeFormatter.m */; }; 14B7A2E21DE9D8F30051AED7 /* PhoneNumberMetaData.json in Resources */ = {isa = PBXBuildFile; fileRef = 187A618A1A25DF04000D8BB6 /* PhoneNumberMetaData.json */; }; 14B7A2E31DE9D8F30051AED7 /* PhoneNumberMetaDataForTesting.json in Resources */ = {isa = PBXBuildFile; fileRef = 187A618B1A25DF04000D8BB6 /* PhoneNumberMetaDataForTesting.json */; }; @@ -69,8 +69,8 @@ 1F31D5331DDD46BD00257818 /* NBMetadataHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = FD12C2691A87401B00B53856 /* NBMetadataHelper.m */; }; 1F31D5391DDD46E600257818 /* NBPhoneNumberDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B842E1934C35F00C350EB /* NBPhoneNumberDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1F31D53A1DDD46EA00257818 /* NBPhoneNumberDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = A81D6A281BECC43A00F68F34 /* NBPhoneNumberDefines.m */; }; - 1F31D53B1DDD46ED00257818 /* NBPhoneNumberUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84311934C35F00C350EB /* NBPhoneNumberUtil.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1F31D53C1DDD46F000257818 /* NBPhoneNumberUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84321934C35F00C350EB /* NBPhoneNumberUtil.m */; }; + 1F31D53B1DDD46ED00257818 /* NBPhoneNumberUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84311934C35F00C350EB /* NBPhoneNumberUtility.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1F31D53C1DDD46F000257818 /* NBPhoneNumberUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84321934C35F00C350EB /* NBPhoneNumberUtility.m */; }; 1F31D53D1DDD46F300257818 /* NBAsYouTypeFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84261934C35F00C350EB /* NBAsYouTypeFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1F31D53E1DDD46F700257818 /* NBAsYouTypeFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84271934C35F00C350EB /* NBAsYouTypeFormatter.m */; }; 1F31D5401DDD477300257818 /* NBPhoneNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B842C1934C35F00C350EB /* NBPhoneNumber.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -94,8 +94,8 @@ 1F31D5631DDD482F00257818 /* NBPhoneMetaData.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B842B1934C35F00C350EB /* NBPhoneMetaData.m */; }; 1F31D5641DDD483200257818 /* NBPhoneNumberDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B842E1934C35F00C350EB /* NBPhoneNumberDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1F31D5651DDD483500257818 /* NBPhoneNumberDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = A81D6A281BECC43A00F68F34 /* NBPhoneNumberDefines.m */; }; - 1F31D5661DDD483700257818 /* NBPhoneNumberUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84311934C35F00C350EB /* NBPhoneNumberUtil.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1F31D5671DDD483A00257818 /* NBPhoneNumberUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84321934C35F00C350EB /* NBPhoneNumberUtil.m */; }; + 1F31D5661DDD483700257818 /* NBPhoneNumberUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84311934C35F00C350EB /* NBPhoneNumberUtility.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1F31D5671DDD483A00257818 /* NBPhoneNumberUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84321934C35F00C350EB /* NBPhoneNumberUtility.m */; }; 1F31D5681DDD483C00257818 /* NBAsYouTypeFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84261934C35F00C350EB /* NBAsYouTypeFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1F31D5691DDD484000257818 /* NBAsYouTypeFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84271934C35F00C350EB /* NBAsYouTypeFormatter.m */; }; 34ACBB8A1B7122AC0064B3BD /* libPhoneNumberiOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 34ACBB891B7122AC0064B3BD /* libPhoneNumberiOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -103,7 +103,7 @@ 34ACBBAB1B7122FD0064B3BD /* NBNumberFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84291934C35F00C350EB /* NBNumberFormat.m */; }; 34ACBBAC1B7122FF0064B3BD /* NBPhoneNumberDesc.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84301934C35F00C350EB /* NBPhoneNumberDesc.m */; }; 34ACBBAD1B7123020064B3BD /* NBPhoneMetaData.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B842B1934C35F00C350EB /* NBPhoneMetaData.m */; }; - 34ACBBAE1B7123090064B3BD /* NBPhoneNumberUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84321934C35F00C350EB /* NBPhoneNumberUtil.m */; }; + 34ACBBAE1B7123090064B3BD /* NBPhoneNumberUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84321934C35F00C350EB /* NBPhoneNumberUtility.m */; }; 34ACBBAF1B71230B0064B3BD /* NBMetadataHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = FD12C2691A87401B00B53856 /* NBMetadataHelper.m */; }; 34ACBBB01B71230E0064B3BD /* NBAsYouTypeFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84271934C35F00C350EB /* NBAsYouTypeFormatter.m */; }; 34ACBBB51B71241E0064B3BD /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29F3A15C17B98AE1005D8E07 /* CoreTelephony.framework */; }; @@ -112,7 +112,7 @@ 34ACBBB81B7124D10064B3BD /* NBNumberFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84281934C35F00C350EB /* NBNumberFormat.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34ACBBB91B7124DB0064B3BD /* NBPhoneNumberDesc.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B842F1934C35F00C350EB /* NBPhoneNumberDesc.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34ACBBBA1B7124E40064B3BD /* NBPhoneMetaData.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B842A1934C35F00C350EB /* NBPhoneMetaData.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 34ACBBBB1B7124EF0064B3BD /* NBPhoneNumberUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84311934C35F00C350EB /* NBPhoneNumberUtil.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 34ACBBBB1B7124EF0064B3BD /* NBPhoneNumberUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84311934C35F00C350EB /* NBPhoneNumberUtility.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34ACBBBC1B7125290064B3BD /* NBMetadataHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = FD12C2681A87401B00B53856 /* NBMetadataHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34ACBBBD1B7125450064B3BD /* NBAsYouTypeFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84261934C35F00C350EB /* NBAsYouTypeFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7C7250801E0EBE7D00F916ED /* libPhoneNumbermacOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C72507E1E0EBE7D00F916ED /* libPhoneNumbermacOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -122,7 +122,7 @@ 7C7250891E0EC03400F916ED /* NBPhoneNumberDesc.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84301934C35F00C350EB /* NBPhoneNumberDesc.m */; }; 7C72508A1E0EC03400F916ED /* NBPhoneMetaData.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B842B1934C35F00C350EB /* NBPhoneMetaData.m */; }; 7C72508B1E0EC03A00F916ED /* NBPhoneNumberDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = A81D6A281BECC43A00F68F34 /* NBPhoneNumberDefines.m */; }; - 7C72508C1E0EC03A00F916ED /* NBPhoneNumberUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84321934C35F00C350EB /* NBPhoneNumberUtil.m */; }; + 7C72508C1E0EC03A00F916ED /* NBPhoneNumberUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84321934C35F00C350EB /* NBPhoneNumberUtility.m */; }; 7C72508D1E0EC03A00F916ED /* NBAsYouTypeFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = FD8B84271934C35F00C350EB /* NBAsYouTypeFormatter.m */; }; 7C72508E1E0EC05900F916ED /* NBMetadataHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = FD12C2681A87401B00B53856 /* NBMetadataHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7C7250911E0EC06900F916ED /* NBPhoneNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B842C1934C35F00C350EB /* NBPhoneNumber.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -130,7 +130,7 @@ 7C7250931E0EC06900F916ED /* NBPhoneNumberDesc.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B842F1934C35F00C350EB /* NBPhoneNumberDesc.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7C7250941E0EC06900F916ED /* NBPhoneMetaData.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B842A1934C35F00C350EB /* NBPhoneMetaData.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7C7250951E0EC06900F916ED /* NBPhoneNumberDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B842E1934C35F00C350EB /* NBPhoneNumberDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 7C7250961E0EC06900F916ED /* NBPhoneNumberUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84311934C35F00C350EB /* NBPhoneNumberUtil.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 7C7250961E0EC06900F916ED /* NBPhoneNumberUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84311934C35F00C350EB /* NBPhoneNumberUtility.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7C7250971E0EC06900F916ED /* NBAsYouTypeFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8B84261934C35F00C350EB /* NBAsYouTypeFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8B0FD2F31E4A85A70049DF81 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B0FD2F21E4A85A70049DF81 /* libz.tbd */; }; 8B0FD2F41E4A85AC0049DF81 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B0FD2F21E4A85A70049DF81 /* libz.tbd */; }; @@ -172,8 +172,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 0F2870911FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NBPhoneNumberUtil+ShortNumber.h"; sourceTree = ""; }; - 0F2870921FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NBPhoneNumberUtil+ShortNumber.m"; sourceTree = ""; }; + 0F2870911FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NBPhoneNumberUtility+ShortNumber.h"; sourceTree = ""; }; + 0F2870921FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NBPhoneNumberUtility+ShortNumber.m"; sourceTree = ""; }; 0F2870961FCF8F13006230BF /* NBRegExMatcher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NBRegExMatcher.h; sourceTree = ""; }; 0F2870971FCF8F13006230BF /* NBRegExMatcher.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NBRegExMatcher.m; sourceTree = ""; }; 0F2870A01FCF9368006230BF /* NBRegularExpressionCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NBRegularExpressionCache.h; sourceTree = ""; }; @@ -246,8 +246,8 @@ FD8B842E1934C35F00C350EB /* NBPhoneNumberDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = NBPhoneNumberDefines.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; FD8B842F1934C35F00C350EB /* NBPhoneNumberDesc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NBPhoneNumberDesc.h; sourceTree = ""; }; FD8B84301934C35F00C350EB /* NBPhoneNumberDesc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NBPhoneNumberDesc.m; sourceTree = ""; }; - FD8B84311934C35F00C350EB /* NBPhoneNumberUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NBPhoneNumberUtil.h; sourceTree = ""; }; - FD8B84321934C35F00C350EB /* NBPhoneNumberUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = NBPhoneNumberUtil.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; + FD8B84311934C35F00C350EB /* NBPhoneNumberUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NBPhoneNumberUtility.h; sourceTree = ""; }; + FD8B84321934C35F00C350EB /* NBPhoneNumberUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = NBPhoneNumberUtility.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; FDAD44B418E11B300041825C /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; /* End PBXFileReference section */ @@ -521,14 +521,14 @@ FD12C2711A8759AF00B53856 /* Model */, FD8B842E1934C35F00C350EB /* NBPhoneNumberDefines.h */, A81D6A281BECC43A00F68F34 /* NBPhoneNumberDefines.m */, - FD8B84311934C35F00C350EB /* NBPhoneNumberUtil.h */, - FD8B84321934C35F00C350EB /* NBPhoneNumberUtil.m */, + FD8B84311934C35F00C350EB /* NBPhoneNumberUtility.h */, + FD8B84321934C35F00C350EB /* NBPhoneNumberUtility.m */, FD8B84261934C35F00C350EB /* NBAsYouTypeFormatter.h */, FD8B84271934C35F00C350EB /* NBAsYouTypeFormatter.m */, 8B0FD2F91E4A88AC0049DF81 /* NSArray+NBAdditions.h */, 8B0FD2FA1E4A88AC0049DF81 /* NSArray+NBAdditions.m */, - 0F2870911FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.h */, - 0F2870921FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.m */, + 0F2870911FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.h */, + 0F2870921FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.m */, ); name = libPhoneNumber.core; path = libPhoneNumber; @@ -557,7 +557,7 @@ 1F31D5401DDD477300257818 /* NBPhoneNumber.h in Headers */, 1F31D5421DDD477800257818 /* NBNumberFormat.h in Headers */, 8B0FD2FC1E4A88AC0049DF81 /* NSArray+NBAdditions.h in Headers */, - 1F31D53B1DDD46ED00257818 /* NBPhoneNumberUtil.h in Headers */, + 1F31D53B1DDD46ED00257818 /* NBPhoneNumberUtility.h in Headers */, 1F31D52E1DDD46B100257818 /* libPhoneNumberwatchOS.h in Headers */, 0F2870991FCF8F13006230BF /* NBRegExMatcher.h in Headers */, 1F31D53D1DDD46F300257818 /* NBAsYouTypeFormatter.h in Headers */, @@ -578,7 +578,7 @@ 1F31D5621DDD482C00257818 /* NBPhoneMetaData.h in Headers */, 8B0FD2FD1E4A88AC0049DF81 /* NSArray+NBAdditions.h in Headers */, 1F31D5601DDD482600257818 /* NBPhoneNumberDesc.h in Headers */, - 1F31D5661DDD483700257818 /* NBPhoneNumberUtil.h in Headers */, + 1F31D5661DDD483700257818 /* NBPhoneNumberUtility.h in Headers */, 0F28709A1FCF8F13006230BF /* NBRegExMatcher.h in Headers */, 1F31D5681DDD483C00257818 /* NBAsYouTypeFormatter.h in Headers */, 1F31D55E1DDD482000257818 /* NBNumberFormat.h in Headers */, @@ -604,8 +604,8 @@ 34ACBBB81B7124D10064B3BD /* NBNumberFormat.h in Headers */, 34ACBB8A1B7122AC0064B3BD /* libPhoneNumberiOS.h in Headers */, 34ACBBB71B7124BE0064B3BD /* NBPhoneNumber.h in Headers */, - 34ACBBBB1B7124EF0064B3BD /* NBPhoneNumberUtil.h in Headers */, - 0F2870931FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.h in Headers */, + 34ACBBBB1B7124EF0064B3BD /* NBPhoneNumberUtility.h in Headers */, + 0F2870931FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.h in Headers */, 0F2870A21FCF9368006230BF /* NBRegularExpressionCache.h in Headers */, 34ACBBB91B7124DB0064B3BD /* NBPhoneNumberDesc.h in Headers */, ); @@ -621,7 +621,7 @@ 7C7250941E0EC06900F916ED /* NBPhoneMetaData.h in Headers */, 8B0FD2FE1E4A88AC0049DF81 /* NSArray+NBAdditions.h in Headers */, 7C7250931E0EC06900F916ED /* NBPhoneNumberDesc.h in Headers */, - 7C7250961E0EC06900F916ED /* NBPhoneNumberUtil.h in Headers */, + 7C7250961E0EC06900F916ED /* NBPhoneNumberUtility.h in Headers */, 0F28709B1FCF8F13006230BF /* NBRegExMatcher.h in Headers */, 7C7250971E0EC06900F916ED /* NBAsYouTypeFormatter.h in Headers */, 7C7250921E0EC06900F916ED /* NBNumberFormat.h in Headers */, @@ -803,6 +803,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, Base, ); mainGroup = FD7A0611167715A0004BBEB6; @@ -891,7 +892,7 @@ 14B7A2B01DE9BF160051AED7 /* NBPhoneNumber.m in Sources */, 0F4D824C1FCF60A5009F9C17 /* NBShortNumberInfoTest.m in Sources */, 14B7A2B11DE9BF160051AED7 /* NBNumberFormat.m in Sources */, - 0F2870AD1FCF9617006230BF /* NBPhoneNumberUtil+ShortNumber.m in Sources */, + 0F2870AD1FCF9617006230BF /* NBPhoneNumberUtility+ShortNumber.m in Sources */, 8B0FD3031E4A88AC0049DF81 /* NSArray+NBAdditions.m in Sources */, 14B7A2B21DE9BF160051AED7 /* NBPhoneNumberDesc.m in Sources */, 14B7A2B31DE9BF160051AED7 /* NBPhoneMetaData.m in Sources */, @@ -899,7 +900,7 @@ 1485C5271E06F4890092F541 /* NBAsYouTypeFormatterTest.m in Sources */, 0F58330D1FD1FD1400F26ED4 /* NBPhoneNumberUtil+ShortNumberTestHelper.m in Sources */, 0F58330D1FD1FD1400F26ED4 /* NBPhoneNumberUtil+ShortNumberTestHelper.m in Sources */, - 14B7A2B51DE9BF160051AED7 /* NBPhoneNumberUtil.m in Sources */, + 14B7A2B51DE9BF160051AED7 /* NBPhoneNumberUtility.m in Sources */, 0F2870AF1FCF961C006230BF /* NBRegExMatcher.m in Sources */, 14B7A2B61DE9BF160051AED7 /* NBAsYouTypeFormatter.m in Sources */, 0F2870B11FCF9620006230BF /* NBRegularExpressionCache.m in Sources */, @@ -915,10 +916,10 @@ 14B7A2DA1DE9D8B30051AED7 /* NBPhoneNumber.m in Sources */, 14B7A2DB1DE9D8B30051AED7 /* NBNumberFormat.m in Sources */, 14B7A2DC1DE9D8B30051AED7 /* NBPhoneNumberDesc.m in Sources */, - 0F2870AE1FCF9617006230BF /* NBPhoneNumberUtil+ShortNumber.m in Sources */, + 0F2870AE1FCF9617006230BF /* NBPhoneNumberUtility+ShortNumber.m in Sources */, 14B7A2DD1DE9D8B30051AED7 /* NBPhoneMetaData.m in Sources */, 14B7A2DE1DE9D8B30051AED7 /* NBPhoneNumberDefines.m in Sources */, - 14B7A2DF1DE9D8B30051AED7 /* NBPhoneNumberUtil.m in Sources */, + 14B7A2DF1DE9D8B30051AED7 /* NBPhoneNumberUtility.m in Sources */, 14B7A2E01DE9D8B30051AED7 /* NBAsYouTypeFormatter.m in Sources */, 14B7A2C81DE9D7F70051AED7 /* ViewController.m in Sources */, 14B7A2C51DE9D7F70051AED7 /* AppDelegate.m in Sources */, @@ -936,10 +937,10 @@ 8B0FD3001E4A88AC0049DF81 /* NSArray+NBAdditions.m in Sources */, 1F31D53E1DDD46F700257818 /* NBAsYouTypeFormatter.m in Sources */, 1F31D5451DDD478100257818 /* NBPhoneNumberDesc.m in Sources */, - 1F31D53C1DDD46F000257818 /* NBPhoneNumberUtil.m in Sources */, + 1F31D53C1DDD46F000257818 /* NBPhoneNumberUtility.m in Sources */, 0F2870A71FCF9368006230BF /* NBRegularExpressionCache.m in Sources */, 1F31D5431DDD477B00257818 /* NBNumberFormat.m in Sources */, - 0F2870AA1FCF9612006230BF /* NBPhoneNumberUtil+ShortNumber.m in Sources */, + 0F2870AA1FCF9612006230BF /* NBPhoneNumberUtility+ShortNumber.m in Sources */, 0F28709D1FCF8F13006230BF /* NBRegExMatcher.m in Sources */, 1F31D5471DDD478600257818 /* NBPhoneMetaData.m in Sources */, 1F31D5411DDD477600257818 /* NBPhoneNumber.m in Sources */, @@ -958,10 +959,10 @@ 1F31D5561DDD47F000257818 /* NBMetadataHelper.m in Sources */, 0F2870A81FCF9368006230BF /* NBRegularExpressionCache.m in Sources */, 1F31D55D1DDD481D00257818 /* NBPhoneNumber.m in Sources */, - 0F2870AB1FCF9612006230BF /* NBPhoneNumberUtil+ShortNumber.m in Sources */, + 0F2870AB1FCF9612006230BF /* NBPhoneNumberUtility+ShortNumber.m in Sources */, 0F28709E1FCF8F13006230BF /* NBRegExMatcher.m in Sources */, 1F31D5691DDD484000257818 /* NBAsYouTypeFormatter.m in Sources */, - 1F31D5671DDD483A00257818 /* NBPhoneNumberUtil.m in Sources */, + 1F31D5671DDD483A00257818 /* NBPhoneNumberUtility.m in Sources */, 1F31D55F1DDD482300257818 /* NBNumberFormat.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -973,10 +974,10 @@ 34ACBBAF1B71230B0064B3BD /* NBMetadataHelper.m in Sources */, 8B0FD2FF1E4A88AC0049DF81 /* NSArray+NBAdditions.m in Sources */, 34ACBBAC1B7122FF0064B3BD /* NBPhoneNumberDesc.m in Sources */, - 0F2870941FCF7936006230BF /* NBPhoneNumberUtil+ShortNumber.m in Sources */, + 0F2870941FCF7936006230BF /* NBPhoneNumberUtility+ShortNumber.m in Sources */, 34ACBBAA1B7122F80064B3BD /* NBPhoneNumber.m in Sources */, 0F28709C1FCF8F13006230BF /* NBRegExMatcher.m in Sources */, - 34ACBBAE1B7123090064B3BD /* NBPhoneNumberUtil.m in Sources */, + 34ACBBAE1B7123090064B3BD /* NBPhoneNumberUtility.m in Sources */, 34ACBBAB1B7122FD0064B3BD /* NBNumberFormat.m in Sources */, 34ACBBAD1B7123020064B3BD /* NBPhoneMetaData.m in Sources */, 34ACBBB01B71230E0064B3BD /* NBAsYouTypeFormatter.m in Sources */, @@ -996,10 +997,10 @@ 7C7250841E0EC01E00F916ED /* NBMetadataHelper.m in Sources */, 0F2870A91FCF9368006230BF /* NBRegularExpressionCache.m in Sources */, 7C7250871E0EC03400F916ED /* NBPhoneNumber.m in Sources */, - 0F2870AC1FCF9612006230BF /* NBPhoneNumberUtil+ShortNumber.m in Sources */, + 0F2870AC1FCF9612006230BF /* NBPhoneNumberUtility+ShortNumber.m in Sources */, 0F28709F1FCF8F13006230BF /* NBRegExMatcher.m in Sources */, 7C72508D1E0EC03A00F916ED /* NBAsYouTypeFormatter.m in Sources */, - 7C72508C1E0EC03A00F916ED /* NBPhoneNumberUtil.m in Sources */, + 7C72508C1E0EC03A00F916ED /* NBPhoneNumberUtility.m in Sources */, 7C7250881E0EC03400F916ED /* NBNumberFormat.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/libPhoneNumber.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/libPhoneNumber.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/libPhoneNumber.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/libPhoneNumber/Internal/NBRegExMatcher.m b/libPhoneNumber/Internal/NBRegExMatcher.m index cfe4b7de..4e4c8fe5 100644 --- a/libPhoneNumber/Internal/NBRegExMatcher.m +++ b/libPhoneNumber/Internal/NBRegExMatcher.m @@ -9,12 +9,12 @@ #import "NBRegExMatcher.h" #import "NBPhoneNumberDesc.h" #import "NBRegularExpressionCache.h" -#import "NBPhoneNumberUtil.h" +#import "NBPhoneNumberUtility.h" // Expose this method to get a modified RegEx to cover the entire RegEx. // Though all RegEx methods and functionalities should be moved to either this class, or a separate -// class rather than in NBPhoneNumberUtil. -@interface NBPhoneNumberUtil() +// class rather than in NBPhoneNumberUtility. +@interface NBPhoneNumberUtility() - (NSRegularExpression *)entireRegularExpressionWithPattern:(NSString *)regexPattern options:(NSRegularExpressionOptions)options error:(NSError **)error; @@ -35,7 +35,7 @@ - (BOOL)matchNationalNumber:(NSString *)string } NSRegularExpression *regEx = - [[NBPhoneNumberUtil sharedInstance] entireRegularExpressionWithPattern:nationalNumberPattern + [[NBPhoneNumberUtility sharedInstance] entireRegularExpressionWithPattern:nationalNumberPattern options:kNilOptions error:nil]; diff --git a/libPhoneNumber/NBAsYouTypeFormatter.m b/libPhoneNumber/NBAsYouTypeFormatter.m index 908bb031..b9ef80f5 100644 --- a/libPhoneNumber/NBAsYouTypeFormatter.m +++ b/libPhoneNumber/NBAsYouTypeFormatter.m @@ -12,7 +12,7 @@ #import "NBNumberFormat.h" #import "NBPhoneMetaData.h" -#import "NBPhoneNumberUtil.h" +#import "NBPhoneNumberUtility.h" #import "NSArray+NBAdditions.h" /** @@ -46,7 +46,7 @@ @interface NBAsYouTypeFormatter () @property(nonatomic, strong, readwrite) NSRegularExpression *ELIGIBLE_FORMAT_PATTERN_; @property(nonatomic, assign, readwrite) BOOL ableToFormat_, inputHasFormatting_, isCompleteNumber_, isExpectingCountryCallingCode_, shouldAddSpaceAfterNationalPrefix_; -@property(nonatomic, strong, readwrite) NBPhoneNumberUtil *phoneUtil_; +@property(nonatomic, strong, readwrite) NBPhoneNumberUtility *phoneUtil_; @property(nonatomic, assign, readwrite) NSUInteger lastMatchPosition_, originalPosition_, positionToRemember_; @property(nonatomic, strong, readwrite) NSMutableArray *possibleFormats_; @@ -273,7 +273,7 @@ - (instancetype)initWithRegionCode:(NSString *)regionCode bundle:(NSBundle *)bun * @private * @type {i18n.phonenumbers.PhoneNumberUtil} */ - self.phoneUtil_ = [NBPhoneNumberUtil sharedInstance]; + self.phoneUtil_ = [NBPhoneNumberUtility sharedInstance]; self.defaultCountry_ = regionCode; self.currentMetaData_ = [self getMetadataForRegion_:self.defaultCountry_]; /** diff --git a/libPhoneNumber/NBPhoneNumberUtil+ShortNumber.h b/libPhoneNumber/NBPhoneNumberUtility+ShortNumber.h similarity index 98% rename from libPhoneNumber/NBPhoneNumberUtil+ShortNumber.h rename to libPhoneNumber/NBPhoneNumberUtility+ShortNumber.h index a056e10b..1a9aeb1b 100644 --- a/libPhoneNumber/NBPhoneNumberUtil+ShortNumber.h +++ b/libPhoneNumber/NBPhoneNumberUtility+ShortNumber.h @@ -1,5 +1,5 @@ // -// NBPhoneNumberUtil+ShortNumber.h +// NBPhoneNumberUtility+ShortNumber.h // libPhoneNumberiOS // // Created by Paween Itthipalkul on 11/29/17. @@ -7,7 +7,7 @@ // #import -#import "NBPhoneNumberUtil.h" +#import "NBPhoneNumberUtility.h" @class NBPhoneNumber; @@ -22,7 +22,7 @@ typedef NS_ENUM(NSUInteger, NBEShortNumberCost) { NBEShortNumberCostPremiumRate = 3, }; -@interface NBPhoneNumberUtil (ShortNumber) +@interface NBPhoneNumberUtility (ShortNumber) // Short number related methods /** diff --git a/libPhoneNumber/NBPhoneNumberUtil+ShortNumber.m b/libPhoneNumber/NBPhoneNumberUtility+ShortNumber.m similarity index 97% rename from libPhoneNumber/NBPhoneNumberUtil+ShortNumber.m rename to libPhoneNumber/NBPhoneNumberUtility+ShortNumber.m index 18a2f99f..8f18da99 100644 --- a/libPhoneNumber/NBPhoneNumberUtil+ShortNumber.m +++ b/libPhoneNumber/NBPhoneNumberUtility+ShortNumber.m @@ -1,12 +1,12 @@ // -// NBPhoneNumberUtil+ShortNumber.m +// NBPhoneNumberUtility+ShortNumber.m // libPhoneNumberiOS // // Created by Paween Itthipalkul on 11/29/17. // Copyright © 2017 Google LLC. All rights reserved. // -#import "NBPhoneNumberUtil+ShortNumber.h" +#import "NBPhoneNumberUtility+ShortNumber.h" #import @@ -21,7 +21,7 @@ static NSString * const PLUS_CHARS_PATTERN = @"[+\uFF0B]+"; -@interface NBPhoneNumberUtil() +@interface NBPhoneNumberUtility() @property(nonatomic, strong, readonly) NBMetadataHelper *helper; @property(nonatomic, strong, readonly) NBRegExMatcher *matcher; @@ -30,7 +30,7 @@ @interface NBPhoneNumberUtil() @end -@implementation NBPhoneNumberUtil (ShortNumber) +@implementation NBPhoneNumberUtility (ShortNumber) - (BOOL)isPossibleShortNumber:(NBPhoneNumber *)phoneNumber forRegion:(NSString *)regionDialingFrom { if (![self doesPhoneNumber:phoneNumber matchesRegion:regionDialingFrom]) { @@ -312,7 +312,7 @@ - (BOOL)matchesEmergencyNumberHelper:(NSString *)number regionCode:(NSString *)r } NSString *normalizedNumber = [self normalizeDigitsOnly:possibleNumber]; - NSSet *exactRegions = [NBPhoneNumberUtil regionsWhereEmergencyNumbersMustBeExact]; + NSSet *exactRegions = [NBPhoneNumberUtility regionsWhereEmergencyNumbersMustBeExact]; BOOL allowsPrefixMatchForRegion = allowsPrefixMatch && ![exactRegions containsObject:regionCode]; diff --git a/libPhoneNumber/NBPhoneNumberUtil.h b/libPhoneNumber/NBPhoneNumberUtility.h similarity index 98% rename from libPhoneNumber/NBPhoneNumberUtil.h rename to libPhoneNumber/NBPhoneNumberUtility.h index 4de9aba9..96f46426 100644 --- a/libPhoneNumber/NBPhoneNumberUtil.h +++ b/libPhoneNumber/NBPhoneNumberUtility.h @@ -1,5 +1,5 @@ // -// NBPhoneNumberUtil.h +// NBPhoneNumberUtility.h // libPhoneNumber // // Created by tabby on 2015. 2. 8.. @@ -11,9 +11,9 @@ @class NBPhoneMetaData, NBPhoneNumber; -@interface NBPhoneNumberUtil : NSObject +@interface NBPhoneNumberUtility : NSObject -+ (NBPhoneNumberUtil *)sharedInstance; ++ (NBPhoneNumberUtility *)sharedInstance; // regular expressions - (NSArray *)matchesByRegex:(NSString *)sourceString regex:(NSString *)pattern; diff --git a/libPhoneNumber/NBPhoneNumberUtil.m b/libPhoneNumber/NBPhoneNumberUtility.m similarity index 99% rename from libPhoneNumber/NBPhoneNumberUtil.m rename to libPhoneNumber/NBPhoneNumberUtility.m index 56606f24..418ee9fe 100644 --- a/libPhoneNumber/NBPhoneNumberUtil.m +++ b/libPhoneNumber/NBPhoneNumberUtility.m @@ -1,12 +1,12 @@ // -// NBPhoneNumberUtil.m +// NBPhoneNumberUtility.m // libPhoneNumber // // Created by tabby on 2015. 2. 8.. // Copyright (c) 2015년 ohtalk.me. All rights reserved. // -#import "NBPhoneNumberUtil.h" +#import "NBPhoneNumberUtility.h" #import #import "NBMetadataHelper.h" #import "NBNumberFormat.h" @@ -36,9 +36,9 @@ static BOOL isNan(NSString *sourceString) { return !([sourceString rangeOfCharacterFromSet:nonDecimalCharacterSet].location == NSNotFound); } -#pragma mark - NBPhoneNumberUtil interface - +#pragma mark - NBPhoneNumberUtility interface - -@interface NBPhoneNumberUtil () +@interface NBPhoneNumberUtility () @property(nonatomic, strong) NSLock *entireStringCacheLock; @property(nonatomic, strong) NSMutableDictionary *entireStringRegexCache; @@ -58,7 +58,7 @@ @interface NBPhoneNumberUtil () @end -@implementation NBPhoneNumberUtil +@implementation NBPhoneNumberUtility #pragma mark - Static Int variables - const static NSUInteger NANPA_COUNTRY_CODE_ = 1; @@ -110,8 +110,8 @@ @implementation NBPhoneNumberUtil #pragma mark - Deprecated methods -+ (NBPhoneNumberUtil *)sharedInstance { - static NBPhoneNumberUtil *sharedOnceInstance = nil; ++ (NBPhoneNumberUtility *)sharedInstance { + static NBPhoneNumberUtility *sharedOnceInstance = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ sharedOnceInstance = [[self alloc] init]; diff --git a/libPhoneNumberTests/NBPhoneNumberParsingPerfTest.m b/libPhoneNumberTests/NBPhoneNumberParsingPerfTest.m index b9268bd2..e1e8f3ff 100644 --- a/libPhoneNumberTests/NBPhoneNumberParsingPerfTest.m +++ b/libPhoneNumberTests/NBPhoneNumberParsingPerfTest.m @@ -14,7 +14,7 @@ #import "NBNumberFormat.h" #import "NBPhoneNumber.h" #import "NBPhoneNumberDesc.h" -#import "NBPhoneNumberUtil.h" +#import "NBPhoneNumberUtility.h" @interface NBExampleNumber: NSObject @@ -52,7 +52,7 @@ - (void)testParsing { NSMutableArray *exampleNumbers = [[NSMutableArray alloc] init]; - NBPhoneNumberUtil *util = [NBPhoneNumberUtil sharedInstance]; + NBPhoneNumberUtility *util = [NBPhoneNumberUtility sharedInstance]; for (NSString *regionCode in regionCodes) { NBPhoneNumber *phoneNumber = [util getExampleNumber:regionCode error:nil]; diff --git a/libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTestHelper.h b/libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTestHelper.h index 7bf3fb65..54f7cc26 100644 --- a/libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTestHelper.h +++ b/libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTestHelper.h @@ -1,5 +1,5 @@ // -// NBPhoneNumberUtil+ShortNumberTestHelper.h +// NBPhoneNumberUtility+ShortNumberTestHelper.h // libPhoneNumber // // Created by Paween Itthipalkul on 12/1/17. @@ -7,17 +7,17 @@ // #import -#import "NBPhoneNumberUtil.h" -#import "NBPhoneNumberUtil+ShortNumber.h" +#import "NBPhoneNumberUtility.h" +#import "NBPhoneNumberUtility+ShortNumber.h" #if SHORT_NUMBER_SUPPORT NS_ASSUME_NONNULL_BEGIN /** - Includes methods used only for testing NBPhoneNumberUtil+ShortNumber. + Includes methods used only for testing NBPhoneNumberUtility+ShortNumber. */ -@interface NBPhoneNumberUtil(ShortNumberTestHelper) +@interface NBPhoneNumberUtility(ShortNumberTestHelper) - (NSString *)exampleShortNumberForCost:(NBEShortNumberCost)cost regionCode:(NSString *)regionCode; - (NSString *)exampleShortNumberWithRegionCode:(NSString *)regionCode; diff --git a/libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTestHelper.m b/libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTestHelper.m index c010e6bc..f87509ab 100644 --- a/libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTestHelper.m +++ b/libPhoneNumberTests/NBPhoneNumberUtil+ShortNumberTestHelper.m @@ -1,12 +1,12 @@ // -// NBPhoneNumberUtil+ShortNumberTestHelper.m +// NBPhoneNumberUtility+ShortNumberTestHelper.m // libPhoneNumber // // Created by Paween Itthipalkul on 12/1/17. // Copyright © 2017 Google LLC. All rights reserved. // -#import "NBPhoneNumberUtil+ShortNumberTestHelper.h" +#import "NBPhoneNumberUtility+ShortNumberTestHelper.h" #import "NBMetadataHelper.h" #import "NBPhoneMetadata.h" @@ -14,13 +14,13 @@ #if SHORT_NUMBER_SUPPORT -@interface NBPhoneNumberUtil() +@interface NBPhoneNumberUtility() @property (nonatomic, strong, readonly) NBMetadataHelper *helper; @end -@implementation NBPhoneNumberUtil(ShortNumberTestHelper) +@implementation NBPhoneNumberUtility(ShortNumberTestHelper) - (NSString *)exampleShortNumberForCost:(NBEShortNumberCost)cost regionCode:(NSString *)regionCode { NBPhoneMetaData *metadata = [self.helper shortNumberMetadataForRegion:regionCode]; diff --git a/libPhoneNumberTests/NBPhoneNumberUtilTest.m b/libPhoneNumberTests/NBPhoneNumberUtilTest.m index d4147ad3..859f3474 100644 --- a/libPhoneNumberTests/NBPhoneNumberUtilTest.m +++ b/libPhoneNumberTests/NBPhoneNumberUtilTest.m @@ -12,7 +12,7 @@ #import "NBNumberFormat.h" #import "NBPhoneNumber.h" #import "NBPhoneNumberDesc.h" -#import "NBPhoneNumberUtil.h" +#import "NBPhoneNumberUtility.h" // Create an entry array for a phone number desc based on numberPattern static NSArray *PhoneNumberDescEntryForNationalNumberPattern(NSString *numberPattern) { @@ -20,7 +20,7 @@ return @[ [NSNull null], [NSNull null], numberPattern ]; } -@interface NBPhoneNumberUtil (FOR_UNIT_TEST) +@interface NBPhoneNumberUtility (FOR_UNIT_TEST) - (BOOL)canBeInternationallyDialled:(NBPhoneNumber *)number; - (BOOL)truncateTooLongNumber:(NBPhoneNumber *)number; @@ -58,7 +58,7 @@ - (NSString *)formatNationalNumberWithPreferredCarrierCode:(NBPhoneNumber *)numb @end @interface NBPhoneNumberUtilTest : XCTestCase -@property(nonatomic, strong) NBPhoneNumberUtil *aUtil; +@property(nonatomic, strong) NBPhoneNumberUtility *aUtil; @property(nonatomic, strong) NBMetadataHelper *helper; @property(nonatomic, readonly, copy) NBPhoneNumber *alphaNumbericNumber; @@ -97,7 +97,7 @@ @implementation NBPhoneNumberUtilTest - (void)setUp { [super setUp]; - self.aUtil = [[NBPhoneNumberUtil alloc] init]; + self.aUtil = [[NBPhoneNumberUtility alloc] init]; self.helper = [[NBMetadataHelper alloc] init]; } diff --git a/libPhoneNumberTests/NBShortNumberInfoTest.m b/libPhoneNumberTests/NBShortNumberInfoTest.m index 40d60d5d..a3aea240 100644 --- a/libPhoneNumberTests/NBShortNumberInfoTest.m +++ b/libPhoneNumberTests/NBShortNumberInfoTest.m @@ -12,8 +12,8 @@ #import "NBPhoneMetaData.h" #import "NBPhoneNumber.h" #import "NBPhoneNumberDesc.h" -#import "NBPhoneNumberUtil+ShortNumber.h" -#import "NBPhoneNumberUtil+ShortNumberTest.h" +#import "NBPhoneNumberUtility+ShortNumber.h" +#import "NBPhoneNumberUtility+ShortNumberTest.h" #if SHORT_NUMBER_SUPPORT @@ -33,7 +33,7 @@ - (void)testMetadataParsing_US { } - (void)testIsPossibleShortNumber { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; NBPhoneNumber *possibleNumber = [[NBPhoneNumber alloc] init]; possibleNumber.countryCode = @33; @@ -54,7 +54,7 @@ - (void)testIsPossibleShortNumber { } - (void)testIsValidShortNumber { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; NBPhoneNumber *valid = [[NBPhoneNumber alloc] init]; valid.countryCode = @33; @@ -82,7 +82,7 @@ - (void)testIsValidShortNumber { } - (void)testIsCarrierSpecific { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; NBPhoneNumber *carrierSpecificNumber = [[NBPhoneNumber alloc] init]; carrierSpecificNumber.countryCode = @1; @@ -110,7 +110,7 @@ - (void)testIsCarrierSpecific { } - (void)testExpectedCost { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; // Premium rate. NSString *premiumRateSample = [util exampleShortNumberForCost:NBEShortNumberCostPremiumRate @@ -185,7 +185,7 @@ - (void)testExpectedCost { } - (void)testExpectedCostForSharedCountryCallingCode { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; NSString *ambiguousPremiumRateString = @"1234"; NBPhoneNumber *ambiguousPremiumRateNumber = [[NBPhoneNumber alloc] init]; @@ -260,7 +260,7 @@ - (void)testExpectedCostForSharedCountryCallingCode { } - (void)testGetExampleShortNumber { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertEqualObjects(@"8711", [util exampleShortNumberWithRegionCode:@"AM"]); XCTAssertEqualObjects(@"1010", [util exampleShortNumberWithRegionCode:@"FR"]); @@ -268,7 +268,7 @@ - (void)testGetExampleShortNumber { } - (void)testGetExampleShortNumberForCost { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertEqualObjects(@"3010", [util exampleShortNumberForCost:NBEShortNumberCostTollFree regionCode:@"FR"]); @@ -281,7 +281,7 @@ - (void)testGetExampleShortNumberForCost { } - (void)testConnectsToEmergencyNumber_US { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertTrue([util connectsToEmergencyNumberFromString:@"911" forRegion:@"US"]); XCTAssertTrue([util connectsToEmergencyNumberFromString:@"112" forRegion:@"US"]); @@ -289,7 +289,7 @@ - (void)testConnectsToEmergencyNumber_US { } - (void)testConnectsToEmergencyNumberLongNumber_US { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertTrue([util connectsToEmergencyNumberFromString:@"9116666666" forRegion:@"US"]); XCTAssertTrue([util connectsToEmergencyNumberFromString:@"1126666666" forRegion:@"US"]); @@ -297,7 +297,7 @@ - (void)testConnectsToEmergencyNumberLongNumber_US { } - (void)testConnectsToEmergencyNumberWithFormatting_US { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertTrue([util connectsToEmergencyNumberFromString:@"9-1-1" forRegion:@"US"]); XCTAssertTrue([util connectsToEmergencyNumberFromString:@"1-1-2" forRegion:@"US"]); @@ -305,7 +305,7 @@ - (void)testConnectsToEmergencyNumberWithFormatting_US { } - (void)testConnectsToEmergencyNumberWithPlusSign_US { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertFalse([util connectsToEmergencyNumberFromString:@"+911" forRegion:@"US"]); XCTAssertFalse([util connectsToEmergencyNumberFromString:@"\uFF0B911" forRegion:@"US"]); @@ -315,7 +315,7 @@ - (void)testConnectsToEmergencyNumberWithPlusSign_US { } - (void)testConnectsToEmergencyNumber_BR { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertTrue([util connectsToEmergencyNumberFromString:@"911" forRegion:@"BR"]); XCTAssertTrue([util connectsToEmergencyNumberFromString:@"190" forRegion:@"BR"]); @@ -323,7 +323,7 @@ - (void)testConnectsToEmergencyNumber_BR { } - (void)testConnectsToEmergencyNumberLongNumber_BR { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; // Brazilian emergency numbers don't work when additional digits are appended. XCTAssertFalse([util connectsToEmergencyNumberFromString:@"9111" forRegion:@"BR"]); @@ -332,14 +332,14 @@ - (void)testConnectsToEmergencyNumberLongNumber_BR { } - (void)testConnectsToEmergencyNumber_CL { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertTrue([util connectsToEmergencyNumberFromString:@"131" forRegion:@"CL"]); XCTAssertTrue([util connectsToEmergencyNumberFromString:@"133" forRegion:@"CL"]); } - (void)testConnectsToEmergencyNumberLongNumber_CL { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; // Chilean emergency numbers don't work when additional digits are appended. XCTAssertFalse([util connectsToEmergencyNumberFromString:@"1313" forRegion:@"CL"]); @@ -347,7 +347,7 @@ - (void)testConnectsToEmergencyNumberLongNumber_CL { } - (void)testConnectsToEmergencyNumber_AO { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; // Angola doesn't have any metadata for emergency numbers. XCTAssertFalse([util connectsToEmergencyNumberFromString:@"911" forRegion:@"AO"]); @@ -356,7 +356,7 @@ - (void)testConnectsToEmergencyNumber_AO { } - (void)testConnectsToEmergencyNumber_ZW { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; // Zimbabwe doesn't have any metadata. XCTAssertFalse([util connectsToEmergencyNumberFromString:@"911" forRegion:@"ZW"]); @@ -365,7 +365,7 @@ - (void)testConnectsToEmergencyNumber_ZW { } - (void)testIsEmergencyNumber_US { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertTrue([util isEmergencyNumber:@"911" forRegion:@"US"]); XCTAssertTrue([util isEmergencyNumber:@"112" forRegion:@"US"]); @@ -373,7 +373,7 @@ - (void)testIsEmergencyNumber_US { } - (void)testIsEmergencyNumberLongNumber_US { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertFalse([util isEmergencyNumber:@"9116666666" forRegion:@"US"]); XCTAssertFalse([util isEmergencyNumber:@"1126666666" forRegion:@"US"]); @@ -381,7 +381,7 @@ - (void)testIsEmergencyNumberLongNumber_US { } - (void)testIsEmergencyNumberWithFormatting_US { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertTrue([util isEmergencyNumber:@"9-1-1" forRegion:@"US"]); XCTAssertTrue([util isEmergencyNumber:@"*911" forRegion:@"US"]); @@ -392,7 +392,7 @@ - (void)testIsEmergencyNumberWithFormatting_US { } - (void)testIsEmergencyNumberWithPlusSign_US { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertFalse([util isEmergencyNumber:@"+911" forRegion:@"US"]); XCTAssertFalse([util isEmergencyNumber:@"\uFF0B911" forRegion:@"US"]); @@ -402,7 +402,7 @@ - (void)testIsEmergencyNumberWithPlusSign_US { } - (void)testIsEmergencyNumber_BR { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; XCTAssertTrue([util connectsToEmergencyNumberFromString:@"911" forRegion:@"BR"]); XCTAssertTrue([util connectsToEmergencyNumberFromString:@"190" forRegion:@"BR"]); @@ -410,7 +410,7 @@ - (void)testIsEmergencyNumber_BR { } - (void)testIsEmergencyNumberLongNumber_BR { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; // Brazilian emergency numbers don't work when additional digits are appended. XCTAssertFalse([util connectsToEmergencyNumberFromString:@"9111" forRegion:@"BR"]); @@ -419,7 +419,7 @@ - (void)testIsEmergencyNumberLongNumber_BR { } - (void)testIsEmergencyNumber_AO { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; // Angola doesn't have any metadata for emergency numbers. XCTAssertFalse([util connectsToEmergencyNumberFromString:@"911" forRegion:@"AO"]); @@ -428,7 +428,7 @@ - (void)testIsEmergencyNumber_AO { } - (void)testIsEmergencyNumber_ZW { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; // Zimbabwe doesn't have any metadata. XCTAssertFalse([util connectsToEmergencyNumberFromString:@"911" forRegion:@"ZW"]); @@ -437,7 +437,7 @@ - (void)testIsEmergencyNumber_ZW { } - (void)testEmergencyNumberForSharedCountryCallingCode { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; // Test the emergency number 112, which is valid in both Australia and the Christmas Islands. NBPhoneNumber *auEmergencyNumber = [util parse:@"112" defaultRegion:@"AU" error:nil]; @@ -462,7 +462,7 @@ - (void)testEmergencyNumberForSharedCountryCallingCode { - (void)testOverlappingNANPANumber { // 211 is an emergency number in Barbados, while it is a toll-free information line in Canada // and the USA. - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; NBPhoneNumber *bb211 = [util parse:@"211" defaultRegion:@"BB" error:nil]; NBPhoneNumber *us211 = [util parse:@"211" defaultRegion:@"US" error:nil]; @@ -480,7 +480,7 @@ - (void)testOverlappingNANPANumber { } - (void)testCountryCallingCodeIsNotIgnored { - NBPhoneNumberUtil *util = [[NBPhoneNumberUtil alloc] init]; + NBPhoneNumberUtility *util = [[NBPhoneNumberUtility alloc] init]; // +46 is the country calling code for Sweden (SE), and 40404 is a valid short number in the US. NBPhoneNumber *seNumber = [util parse:@"+4640404" defaultRegion:@"SE" error:nil];