diff --git a/.travis.yml b/.travis.yml index 16be4fe..8655401 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode8 +osx_image: xcode8.2 env: global: - LC_CTYPE=en_US.UTF-8 @@ -9,21 +9,22 @@ env: - OSX_FRAMEWORK_SCHEME="ValidationComponents macOS" - TVOS_FRAMEWORK_SCHEME="ValidationComponents tvOS" - WATCHOS_FRAMEWORK_SCHEME="ValidationComponents watchOS" - - IOS_SDK=iphonesimulator10.0 - - MACOS_SDK=macosx10.12 - - TVOS_SDK=appletvsimulator10.0 - - WATCHOS_SDK=watchsimulator3.0 + - IOS_SDK=iphonesimulator + - MACOS_SDK=macosx + - TVOS_SDK=appletvsimulator + - WATCHOS_SDK=watchsimulator matrix: - - DESTINATION="OS=10.0,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO" - - DESTINATION="arch=x86_64" SCHEME="$OSX_FRAMEWORK_SCHEME" SDK="$MACOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO" - - DESTINATION="OS=10.0,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="YES" - - DESTINATION="OS=3.0,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO" + - DESTINATION="OS=latest,name=iPhone 7" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="YES" + - DESTINATION="arch=x86_64" SCHEME="$OSX_FRAMEWORK_SCHEME" SDK="$MACOS_SDK" CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="NO" + - DESTINATION="OS=latest,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" CONFIGURATION="Debug" RUN_TESTS="YES" POD_LINT="NO" + - DESTINATION="OS=latest,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" CONFIGURATION="Debug" RUN_TESTS="NO" POD_LINT="NO" before_install: - brew update - brew outdated carthage || brew upgrade carthage - gem install xcpretty --pre --no-rdoc --no-ri --no-document --quiet - gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet + - echo y | fastlane snapshot reset_simulators script: - set -o pipefail diff --git a/Cartfile b/Cartfile index 268f8d5..216096d 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "alexcristea/validation-kit" "develop" \ No newline at end of file +github "nsagora/validation-toolkit" ~> 0.4.1 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index c1cc7a8..5712c1c 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "alexcristea/validation-kit" "6569766d422fa7dc664222915c8b96adb08e61fb" +github "nsagora/validation-toolkit" "0.4.1" diff --git a/Sources/EmailValidationPredicate.swift b/Sources/EmailValidationPredicate.swift index 4b64842..b4d8271 100644 --- a/Sources/EmailValidationPredicate.swift +++ b/Sources/EmailValidationPredicate.swift @@ -7,7 +7,7 @@ // import Foundation -import ValidationKit +import ValidationToolkit public struct EmailValidationPredicate: ValidationPredicate { diff --git a/Sources/Info.plist b/Sources/Info.plist index badd676..0d6341f 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.2.0 + 0.3.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/Sources/URLValidationRule.swift b/Sources/URLValidationRule.swift index ec8bb62..273f29c 100644 --- a/Sources/URLValidationRule.swift +++ b/Sources/URLValidationRule.swift @@ -7,7 +7,7 @@ // import Foundation -import ValidationKit +import ValidationToolkit public struct URLValidationPredicate: ValidationPredicate{ diff --git a/Sources/ValueMatchingValidationPredicate.swift b/Sources/ValueMatchingValidationPredicate.swift index f574e73..732b42f 100644 --- a/Sources/ValueMatchingValidationPredicate.swift +++ b/Sources/ValueMatchingValidationPredicate.swift @@ -7,7 +7,7 @@ // import Foundation -import ValidationKit +import ValidationToolkit public struct ValueMatchingValidationPredicate: ValidationPredicate { diff --git a/Tests/Info.plist b/Tests/Info.plist index e2c00d3..87d3dc8 100644 --- a/Tests/Info.plist +++ b/Tests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.2.0 + 0.3.0 CFBundleVersion 1 diff --git a/ValidationComponents.podspec b/ValidationComponents.podspec index 7fc1c64..a5db0d3 100644 --- a/ValidationComponents.podspec +++ b/ValidationComponents.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'ValidationComponents' - s.version = '0.2.0' + s.version = '0.3.0' s.summary = 'Lightweight framework for input validation' # This description is used to generate tags and improve search results. @@ -30,5 +30,7 @@ Pod::Spec.new do |s| s.tvos.deployment_target = '9.0' s.watchos.deployment_target = '2.0' - s.source_files = 'Sources/**' + s.source_files = 'Sources/*.swift' + + s.dependency 'ValidationToolkit', '~> 0.4.1' end diff --git a/ValidationComponents.xcodeproj/project.pbxproj b/ValidationComponents.xcodeproj/project.pbxproj index 962974f..fb76375 100644 --- a/ValidationComponents.xcodeproj/project.pbxproj +++ b/ValidationComponents.xcodeproj/project.pbxproj @@ -25,6 +25,10 @@ FA2293F61D7097A100CBB386 /* URLValidationPredicateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2293F51D7097A100CBB386 /* URLValidationPredicateTests.swift */; }; FA2293F71D7097A100CBB386 /* URLValidationPredicateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2293F51D7097A100CBB386 /* URLValidationPredicateTests.swift */; }; FA2293F81D7097A100CBB386 /* URLValidationPredicateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2293F51D7097A100CBB386 /* URLValidationPredicateTests.swift */; }; + FA68C4B81E635F5D00EC7960 /* ValidationToolkit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA68C4B71E635F5D00EC7960 /* ValidationToolkit.framework */; }; + FA68C4BA1E635F6500EC7960 /* ValidationToolkit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA68C4B91E635F6500EC7960 /* ValidationToolkit.framework */; }; + FA68C4BC1E635F6E00EC7960 /* ValidationToolkit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA68C4BB1E635F6E00EC7960 /* ValidationToolkit.framework */; }; + FA68C4BE1E635F7500EC7960 /* ValidationToolkit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA68C4BD1E635F7500EC7960 /* ValidationToolkit.framework */; }; FA6A28251D6CE7EA00C2CA0B /* ValueMathcingValidationPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6A28241D6CE7EA00C2CA0B /* ValueMathcingValidationPredicate.swift */; }; FA6A28261D6CE7EA00C2CA0B /* ValueMathcingValidationPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6A28241D6CE7EA00C2CA0B /* ValueMathcingValidationPredicate.swift */; }; FA6A28271D6CE7EA00C2CA0B /* ValueMathcingValidationPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6A28241D6CE7EA00C2CA0B /* ValueMathcingValidationPredicate.swift */; }; @@ -35,10 +39,6 @@ FAE2BA2C1D6AD9C80020512C /* ValidationComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = FA1904B41D6AD99E005E1E89 /* ValidationComponents.h */; settings = {ATTRIBUTES = (Public, ); }; }; FAE2BA2D1D6AD9C90020512C /* ValidationComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = FA1904B41D6AD99E005E1E89 /* ValidationComponents.h */; settings = {ATTRIBUTES = (Public, ); }; }; FAE2BA2E1D6AD9C90020512C /* ValidationComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = FA1904B41D6AD99E005E1E89 /* ValidationComponents.h */; settings = {ATTRIBUTES = (Public, ); }; }; - FAE2BA391D6AEBD70020512C /* ValidationKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAE2BA381D6AEBD70020512C /* ValidationKit.framework */; }; - FAE2BA3B1D6AEBE20020512C /* ValidationKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAE2BA3A1D6AEBE20020512C /* ValidationKit.framework */; }; - FAE2BA3D1D6AEBEC0020512C /* ValidationKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAE2BA3C1D6AEBEC0020512C /* ValidationKit.framework */; }; - FAE2BA3F1D6AEBF30020512C /* ValidationKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAE2BA3E1D6AEBF30020512C /* ValidationKit.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -80,6 +80,10 @@ FA1904B61D6AD99E005E1E89 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; FA2293F01D7096EF00CBB386 /* URLValidationRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLValidationRule.swift; sourceTree = ""; }; FA2293F51D7097A100CBB386 /* URLValidationPredicateTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLValidationPredicateTests.swift; sourceTree = ""; }; + FA68C4B71E635F5D00EC7960 /* ValidationToolkit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ValidationToolkit.framework; path = Carthage/Build/iOS/ValidationToolkit.framework; sourceTree = ""; }; + FA68C4B91E635F6500EC7960 /* ValidationToolkit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ValidationToolkit.framework; path = Carthage/Build/Mac/ValidationToolkit.framework; sourceTree = ""; }; + FA68C4BB1E635F6E00EC7960 /* ValidationToolkit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ValidationToolkit.framework; path = Carthage/Build/tvOS/ValidationToolkit.framework; sourceTree = ""; }; + FA68C4BD1E635F7500EC7960 /* ValidationToolkit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ValidationToolkit.framework; path = Carthage/Build/watchOS/ValidationToolkit.framework; sourceTree = ""; }; FA6A28241D6CE7EA00C2CA0B /* ValueMathcingValidationPredicate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValueMathcingValidationPredicate.swift; sourceTree = ""; }; FA6A28281D6CE84C00C2CA0B /* ValueMatchingValidationPredicate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValueMatchingValidationPredicate.swift; sourceTree = ""; }; FAE2BA381D6AEBD70020512C /* ValidationKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ValidationKit.framework; path = ../Carthage/Build/Mac/ValidationKit.framework; sourceTree = ""; }; @@ -93,7 +97,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FAE2BA3B1D6AEBE20020512C /* ValidationKit.framework in Frameworks */, + FA68C4B81E635F5D00EC7960 /* ValidationToolkit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -109,7 +113,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FAE2BA391D6AEBD70020512C /* ValidationKit.framework in Frameworks */, + FA68C4BA1E635F6500EC7960 /* ValidationToolkit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -125,7 +129,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FAE2BA3D1D6AEBEC0020512C /* ValidationKit.framework in Frameworks */, + FA68C4BC1E635F6E00EC7960 /* ValidationToolkit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -141,7 +145,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FAE2BA3F1D6AEBF30020512C /* ValidationKit.framework in Frameworks */, + FA68C4BE1E635F7500EC7960 /* ValidationToolkit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -214,6 +218,10 @@ FAE2BA371D6AEBD70020512C /* Frameworks */ = { isa = PBXGroup; children = ( + FA68C4BD1E635F7500EC7960 /* ValidationToolkit.framework */, + FA68C4BB1E635F6E00EC7960 /* ValidationToolkit.framework */, + FA68C4B91E635F6500EC7960 /* ValidationToolkit.framework */, + FA68C4B71E635F5D00EC7960 /* ValidationToolkit.framework */, FAE2BA3E1D6AEBF30020512C /* ValidationKit.framework */, FAE2BA3C1D6AEBEC0020512C /* ValidationKit.framework */, FAE2BA3A1D6AEBE20020512C /* ValidationKit.framework */, @@ -268,7 +276,6 @@ FA1904511D6AD6C5005E1E89 /* Frameworks */, FA1904521D6AD6C5005E1E89 /* Headers */, FA1904531D6AD6C5005E1E89 /* Resources */, - FAE2BA401D6AEC2C0020512C /* Copy Carthage Framework */, ); buildRules = ( ); @@ -305,7 +312,6 @@ FA19046E1D6AD6E1005E1E89 /* Frameworks */, FA19046F1D6AD6E1005E1E89 /* Headers */, FA1904701D6AD6E1005E1E89 /* Resources */, - FAE2BA411D6AEC740020512C /* Copy Carthage Framework */, ); buildRules = ( ); @@ -342,7 +348,6 @@ FA19048A1D6AD708005E1E89 /* Frameworks */, FA19048B1D6AD708005E1E89 /* Headers */, FA19048C1D6AD708005E1E89 /* Resources */, - FAE2BA421D6AEC850020512C /* Copy Carthage Framework */, ); buildRules = ( ); @@ -379,7 +384,6 @@ FA1904A61D6AD727005E1E89 /* Frameworks */, FA1904A71D6AD727005E1E89 /* Headers */, FA1904A81D6AD727005E1E89 /* Resources */, - FAE2BA431D6AEC920020512C /* Copy Carthage Framework */, ); buildRules = ( ); @@ -397,7 +401,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0800; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0820; ORGANIZATIONNAME = "iOS NSAgora"; TargetAttributes = { FA1904541D6AD6C5005E1E89 = { @@ -513,69 +517,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - FAE2BA401D6AEC2C0020512C /* Copy Carthage Framework */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/ValidationKit.framework", - ); - name = "Copy Carthage Framework"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; - FAE2BA411D6AEC740020512C /* Copy Carthage Framework */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/Mac/ValidationKit.framework", - ); - name = "Copy Carthage Framework"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; - FAE2BA421D6AEC850020512C /* Copy Carthage Framework */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/tvOS/ValidationKit.framework", - ); - name = "Copy Carthage Framework"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; - FAE2BA431D6AEC920020512C /* Copy Carthage Framework */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/watchOS/ValidationKit.framework", - ); - name = "Copy Carthage Framework"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ FA1904501D6AD6C5005E1E89 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -671,6 +612,25 @@ FA19044E1D6AD62C005E1E89 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.nsagora.validation-components"; }; name = Debug; @@ -678,6 +638,23 @@ FA19044F1D6AD62C005E1E89 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.nsagora.validation-components"; }; name = Release; @@ -714,7 +691,7 @@ ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/Carthage/build/iOS", + "$(PROJECT_DIR)/Carthage/Build/iOS", ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -733,7 +710,7 @@ INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = ValidationComponents; @@ -780,7 +757,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/Carthage/build/iOS", + "$(PROJECT_DIR)/Carthage/Build/iOS", ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; @@ -793,7 +770,7 @@ INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = ValidationComponents; SDKROOT = iphoneos; @@ -848,7 +825,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -895,7 +872,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "ValidationComponents Tests"; @@ -939,7 +916,7 @@ ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/Carthage/build/Mac", + "$(PROJECT_DIR)/Carthage/Build/Mac", ); FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -958,7 +935,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -1006,7 +983,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/Carthage/build/Mac", + "$(PROJECT_DIR)/Carthage/Build/Mac", ); FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1019,7 +996,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = ValidationComponents; @@ -1075,7 +1052,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "ValidationComponents Tests"; @@ -1123,7 +1100,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "ValidationComponents Tests"; SDKROOT = macosx; @@ -1153,6 +1130,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; @@ -1164,7 +1142,7 @@ ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/Carthage/build/tvOS", + "$(PROJECT_DIR)/Carthage/Build/tvOS", ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -1182,7 +1160,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = ValidationComponents; @@ -1219,6 +1197,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -1230,7 +1209,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/Carthage/build/tvOS", + "$(PROJECT_DIR)/Carthage/Build/tvOS", ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; @@ -1242,7 +1221,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = ValidationComponents; SDKROOT = appletvos; @@ -1306,7 +1285,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -1351,7 +1330,7 @@ SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; }; name = Release; @@ -1378,6 +1357,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; @@ -1389,7 +1369,7 @@ ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/Carthage/build/watchOS", + "$(PROJECT_DIR)/Carthage/Build/watchOS", ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -1407,7 +1387,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = ValidationComponents; @@ -1445,6 +1425,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -1456,7 +1437,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(SRCROOT)/Carthage/build/watchOS", + "$(PROJECT_DIR)/Carthage/Build/watchOS", ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; @@ -1468,7 +1449,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = ValidationComponents; SDKROOT = watchos; diff --git a/ValidationComponents.xcodeproj/xcshareddata/xcschemes/ValidationComponents iOS.xcscheme b/ValidationComponents.xcodeproj/xcshareddata/xcschemes/ValidationComponents iOS.xcscheme index 0fbfd88..9c5ecb0 100644 --- a/ValidationComponents.xcodeproj/xcshareddata/xcschemes/ValidationComponents iOS.xcscheme +++ b/ValidationComponents.xcodeproj/xcshareddata/xcschemes/ValidationComponents iOS.xcscheme @@ -1,6 +1,6 @@