diff --git a/build.sh b/build.sh index b229483c4..44bd3c4dd 100755 --- a/build.sh +++ b/build.sh @@ -34,7 +34,6 @@ if [ "$MODE" = "examples" ]; then for example in examples/*/; do echo "Building $example." - pod install --project-directory=$example xcodebuild \ -workspace "${example}Sample.xcworkspace" \ -scheme Sample \ diff --git a/examples/PhoneBook/Podfile b/examples/PhoneBook/Podfile deleted file mode 100644 index 38a5f91eb..000000000 --- a/examples/PhoneBook/Podfile +++ /dev/null @@ -1,14 +0,0 @@ -platform :ios, '8.0' - -target 'Sample' do - use_frameworks! - - # Pods for Sample - pod 'PhoneNumberKit', :path => '../..' - - target 'SampleTests' do - inherit! :search_paths - # Pods for testing - end - -end diff --git a/examples/PhoneBook/Sample.xcodeproj/project.pbxproj b/examples/PhoneBook/Sample.xcodeproj/project.pbxproj index 332237eb3..3b12a9b2a 100644 --- a/examples/PhoneBook/Sample.xcodeproj/project.pbxproj +++ b/examples/PhoneBook/Sample.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -16,6 +16,7 @@ 347209751BB808D1004DE6DA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 347209731BB808D1004DE6DA /* LaunchScreen.storyboard */; }; 347209801BB808D1004DE6DA /* SampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3472097F1BB808D1004DE6DA /* SampleTests.swift */; }; 3472098E1BB80A4F004DE6DA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3472098D1BB80A4F004DE6DA /* Foundation.framework */; }; + 34F26FD72517E51700B6AF4D /* PhoneNumberKit in Frameworks */ = {isa = PBXBuildFile; productRef = 34F26FD62517E51700B6AF4D /* PhoneNumberKit */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -63,6 +64,7 @@ buildActionMask = 2147483647; files = ( 344D875A1BDED6A600487684 /* ContactsUI.framework in Frameworks */, + 34F26FD72517E51700B6AF4D /* PhoneNumberKit in Frameworks */, 344D87571BDED6A200487684 /* Contacts.framework in Frameworks */, 3472098E1BB80A4F004DE6DA /* Foundation.framework in Frameworks */, ); @@ -138,6 +140,9 @@ dependencies = ( ); name = Sample; + packageProductDependencies = ( + 34F26FD62517E51700B6AF4D /* PhoneNumberKit */, + ); productName = Sample; productReference = 347209671BB808D1004DE6DA /* Sample.app */; productType = "com.apple.product-type.application"; @@ -166,7 +171,7 @@ 3472095F1BB808D1004DE6DA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = "Roy Marmelstein"; TargetAttributes = { 347209661BB808D1004DE6DA = { @@ -181,13 +186,16 @@ }; buildConfigurationList = 347209621BB808D1004DE6DA /* Build configuration list for PBXProject "Sample" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, Base, ); mainGroup = 3472095E1BB808D1004DE6DA; + packageReferences = ( + 34F26FD52517E51700B6AF4D /* XCRemoteSwiftPackageReference "PhoneNumberKit" */, + ); productRefGroup = 347209681BB808D1004DE6DA /* Products */; projectDirPath = ""; projectRoot = ""; @@ -289,6 +297,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -313,13 +322,13 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "$(inherited)"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -346,6 +355,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -364,12 +374,13 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "$(inherited)"; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; }; name = Release; @@ -381,7 +392,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Sample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.Sample; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -395,7 +409,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Sample/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.Sample; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -411,7 +428,11 @@ "$(PROJECT_DIR)/Sample", ); INFOPLIST_FILE = SampleTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.SampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Sample.app/Sample"; @@ -427,7 +448,11 @@ "$(PROJECT_DIR)/Sample", ); INFOPLIST_FILE = SampleTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.SampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Sample.app/Sample"; @@ -465,6 +490,25 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 34F26FD52517E51700B6AF4D /* XCRemoteSwiftPackageReference "PhoneNumberKit" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/marmelroy/PhoneNumberKit.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 3.3.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 34F26FD62517E51700B6AF4D /* PhoneNumberKit */ = { + isa = XCSwiftPackageProductDependency; + package = 34F26FD52517E51700B6AF4D /* XCRemoteSwiftPackageReference "PhoneNumberKit" */; + productName = PhoneNumberKit; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 3472095F1BB808D1004DE6DA /* Project object */; } diff --git a/examples/PhoneBook/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/examples/PhoneBook/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata index a80c03824..919434a62 100644 --- a/examples/PhoneBook/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/examples/PhoneBook/Sample.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/examples/PhoneBook/Sample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/examples/PhoneBook/Sample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 000000000..f6e5d7fd2 --- /dev/null +++ b/examples/PhoneBook/Sample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "PhoneNumberKit", + "repositoryURL": "https://github.com/marmelroy/PhoneNumberKit.git", + "state": { + "branch": null, + "revision": "edbd0b43e914083c3b8af9403f64ac80f8270e47", + "version": "3.3.0" + } + } + ] + }, + "version": 1 +} diff --git a/examples/PhoneBook/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme b/examples/PhoneBook/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme index 2a284caa1..40b903b31 100644 --- a/examples/PhoneBook/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme +++ b/examples/PhoneBook/Sample.xcodeproj/xcshareddata/xcschemes/Sample.xcscheme @@ -1,6 +1,6 @@ - - - - + + - -