From c33b661a37367eb3d9327af33facffa50800136c Mon Sep 17 00:00:00 2001 From: Roy Marmelstein Date: Mon, 5 Aug 2019 10:06:25 +0300 Subject: [PATCH] Swift 5 release 3.0.0 --- .swift-version | 2 +- Package.swift | 2 +- PhoneNumberKit.xcodeproj/project.pbxproj | 47 ++++++++++-------------- PhoneNumberKit/Info.plist | 4 +- PhoneNumberKitTests/Info.plist | 4 +- README.md | 4 +- 6 files changed, 27 insertions(+), 36 deletions(-) diff --git a/.swift-version b/.swift-version index bf77d5496..819e07a22 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.2 +5.0 diff --git a/Package.swift b/Package.swift index 5b7f0651a..45c51ade8 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.2 +// swift-tools-version:5.0 import PackageDescription diff --git a/PhoneNumberKit.xcodeproj/project.pbxproj b/PhoneNumberKit.xcodeproj/project.pbxproj index bb93b8ef4..9d021c880 100644 --- a/PhoneNumberKit.xcodeproj/project.pbxproj +++ b/PhoneNumberKit.xcodeproj/project.pbxproj @@ -399,6 +399,7 @@ developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( + en, ); mainGroup = 3424185A1BB6E5A000EE70E7; productRefGroup = 342418651BB6E5A000EE70E7 /* Products */; @@ -584,7 +585,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -609,7 +610,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -646,7 +647,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -664,7 +665,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -680,7 +681,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 21; + DYLIB_CURRENT_VERSION = 22; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = PhoneNumberKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -690,7 +691,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -702,7 +702,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 21; + DYLIB_CURRENT_VERSION = 22; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = PhoneNumberKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -712,7 +712,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; }; name = Release; }; @@ -723,7 +722,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.PhoneNumberKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -735,7 +733,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.PhoneNumberKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; }; name = Release; }; @@ -745,10 +742,10 @@ CLANG_ANALYZER_NONNULL = YES; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 21; + DYLIB_CURRENT_VERSION = 22; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/PhoneNumberKit/Info.plist"; @@ -759,7 +756,6 @@ PRODUCT_NAME = PhoneNumberKit; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -769,10 +765,10 @@ CLANG_ANALYZER_NONNULL = YES; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 21; + DYLIB_CURRENT_VERSION = 22; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/PhoneNumberKit/Info.plist"; @@ -783,7 +779,6 @@ PRODUCT_NAME = PhoneNumberKit; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; }; name = Release; }; @@ -793,10 +788,10 @@ APPLICATION_EXTENSION_API_ONLY = YES; CLANG_ANALYZER_NONNULL = YES; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 21; + DYLIB_CURRENT_VERSION = 22; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = PhoneNumberKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -805,7 +800,6 @@ PRODUCT_NAME = PhoneNumberKit; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.2; }; @@ -817,10 +811,10 @@ APPLICATION_EXTENSION_API_ONLY = YES; CLANG_ANALYZER_NONNULL = YES; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 21; + DYLIB_CURRENT_VERSION = 22; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = PhoneNumberKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -829,7 +823,6 @@ PRODUCT_NAME = PhoneNumberKit; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.2; }; @@ -840,10 +833,10 @@ buildSettings = { CLANG_ANALYZER_NONNULL = YES; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 21; + DYLIB_CURRENT_VERSION = 22; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "$(SRCROOT)/PhoneNumberKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -852,7 +845,6 @@ PRODUCT_NAME = PhoneNumberKit; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.2; }; @@ -863,10 +855,10 @@ buildSettings = { CLANG_ANALYZER_NONNULL = YES; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - CURRENT_PROJECT_VERSION = 21; + CURRENT_PROJECT_VERSION = 22; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 21; + DYLIB_CURRENT_VERSION = 22; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "$(SRCROOT)/PhoneNumberKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -875,7 +867,6 @@ PRODUCT_NAME = PhoneNumberKit; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.2; }; diff --git a/PhoneNumberKit/Info.plist b/PhoneNumberKit/Info.plist index 66513e267..d7314fb2e 100644 --- a/PhoneNumberKit/Info.plist +++ b/PhoneNumberKit/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.6.0 + 3.0.0 CFBundleSignature ???? CFBundleVersion - 21 + 22 NSPrincipalClass diff --git a/PhoneNumberKitTests/Info.plist b/PhoneNumberKitTests/Info.plist index 061f69ba4..0c442e002 100644 --- a/PhoneNumberKitTests/Info.plist +++ b/PhoneNumberKitTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.6.0 + 3.0.0 CFBundleSignature ???? CFBundleVersion - 21 + 22 diff --git a/README.md b/README.md index 63a88b9d8..b7144431f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) # PhoneNumberKit -Swift 4.2 framework for parsing, formatting and validating international phone numbers. +Swift 5.0 framework for parsing, formatting and validating international phone numbers. Inspired by Google's libphonenumber. [Migrating from PhoneNumberKit 0.x? See the migration guide.](https://github.com/marmelroy/PhoneNumberKit/blob/master/Documentation/OXMIGRATIONGUIDE.md) @@ -109,5 +109,5 @@ github "marmelroy/PhoneNumberKit" ### Setting up with [CocoaPods](http://cocoapods.org/?q=PhoneNumberKit) ```ruby source 'https://github.com/CocoaPods/Specs.git' -pod 'PhoneNumberKit', '~> 2.6' +pod 'PhoneNumberKit', '~> 3.0' ```