diff --git a/.gitignore b/.gitignore index 8a8a751..8045370 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ Nimble_Snapshots.xcodeproj/xcuserdata/ # Carthage Carthage/Checkouts Carthage/Build +build # Swift Package Manager .swiftpm diff --git a/Nimble_Snapshots.xcodeproj/project.pbxproj b/Nimble_Snapshots.xcodeproj/project.pbxproj index 7c59d8f..8e828f1 100644 --- a/Nimble_Snapshots.xcodeproj/project.pbxproj +++ b/Nimble_Snapshots.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -16,6 +16,8 @@ D4F7D47E1ED764CD00B4D2FE /* DynamicSizeSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4F7D4781ED764CD00B4D2FE /* DynamicSizeSnapshot.swift */; }; D4F7D47F1ED764CD00B4D2FE /* HaveValidDynamicTypeSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4F7D47A1ED764CD00B4D2FE /* HaveValidDynamicTypeSnapshot.swift */; }; D4F7D4821ED764CD00B4D2FE /* PrettyDynamicTypeSyntax.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4F7D47D1ED764CD00B4D2FE /* PrettyDynamicTypeSyntax.swift */; }; + DD078918272AE92500F605C3 /* FBSnapshotTestCase.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD078917272AE92500F605C3 /* FBSnapshotTestCase.xcframework */; }; + DD07891A272AE92A00F605C3 /* Nimble.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD078919272AE92A00F605C3 /* Nimble.xcframework */; }; DD83832926E555BC0040266F /* NBSMockedApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD83832826E555BC0040266F /* NBSMockedApplication.swift */; }; /* End PBXBuildFile section */ @@ -23,8 +25,6 @@ 095B476D1D4773F000880922 /* Nimble_Snapshots.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Nimble_Snapshots.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 095B47701D4773F000880922 /* Nimble_Snapshots.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Nimble_Snapshots.h; sourceTree = ""; }; 095B47721D4773F000880922 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 095B47861D47761500880922 /* FBSnapshotTestCase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSnapshotTestCase.framework; path = Carthage/Build/iOS/FBSnapshotTestCase.framework; sourceTree = ""; }; - 095B47871D47761500880922 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/iOS/Nimble.framework; sourceTree = ""; }; 095B478C1D47794300880922 /* HaveValidSnapshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HaveValidSnapshot.swift; sourceTree = ""; }; 095B478D1D47794300880922 /* CurrentTestCaseTracker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CurrentTestCaseTracker.swift; sourceTree = ""; }; 095B478E1D47794300880922 /* PrettySyntax.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrettySyntax.swift; sourceTree = ""; }; @@ -35,6 +35,8 @@ D4F7D4781ED764CD00B4D2FE /* DynamicSizeSnapshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicSizeSnapshot.swift; sourceTree = ""; }; D4F7D47A1ED764CD00B4D2FE /* HaveValidDynamicTypeSnapshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HaveValidDynamicTypeSnapshot.swift; sourceTree = ""; }; D4F7D47D1ED764CD00B4D2FE /* PrettyDynamicTypeSyntax.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrettyDynamicTypeSyntax.swift; sourceTree = ""; }; + DD078917272AE92500F605C3 /* FBSnapshotTestCase.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSnapshotTestCase.xcframework; path = Carthage/Build/FBSnapshotTestCase.xcframework; sourceTree = ""; }; + DD078919272AE92A00F605C3 /* Nimble.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Nimble.xcframework; path = Carthage/Build/Nimble.xcframework; sourceTree = ""; }; DD83832826E555BC0040266F /* NBSMockedApplication.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NBSMockedApplication.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -43,6 +45,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + DD07891A272AE92A00F605C3 /* Nimble.xcframework in Frameworks */, + DD078918272AE92500F605C3 /* FBSnapshotTestCase.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -55,8 +59,8 @@ A0862BFC229C43EE004E82D2 /* Nimble-Snapshots.podspec */, 095B476F1D4773F000880922 /* Nimble_Snapshots */, 095B476E1D4773F000880922 /* Products */, - 095B47861D47761500880922 /* FBSnapshotTestCase.framework */, - 095B47871D47761500880922 /* Nimble.framework */, + DD078917272AE92500F605C3 /* FBSnapshotTestCase.xcframework */, + DD078919272AE92A00F605C3 /* Nimble.xcframework */, ); sourceTree = ""; }; @@ -250,6 +254,7 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -266,7 +271,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -311,6 +316,7 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -321,7 +327,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; @@ -343,10 +349,24 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; + "FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = ( + "$(PROJECT_DIR)/Carthage/Build", + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = ( + "$(PROJECT_DIR)/Carthage/Build", + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", + ); INFOPLIST_FILE = Nimble_Snapshots/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.wallapop.Nimble-Snapshots"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -367,10 +387,24 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; + "FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = ( + "$(PROJECT_DIR)/Carthage/Build", + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = ( + "$(PROJECT_DIR)/Carthage/Build", + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", + ); INFOPLIST_FILE = Nimble_Snapshots/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.wallapop.Nimble-Snapshots"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Nimble_Snapshots/Nimble_Snapshots.xcconfig b/Nimble_Snapshots/Nimble_Snapshots.xcconfig index 103d55f..36fc465 100644 --- a/Nimble_Snapshots/Nimble_Snapshots.xcconfig +++ b/Nimble_Snapshots/Nimble_Snapshots.xcconfig @@ -2,12 +2,13 @@ SDKROOT[sdk=iphone*] = iphoneos SDKROOT[sdk=appletv*] = appletvos SUPPORTED_PLATFORMS = appletvsimulator appletvos iphonesimulator iphoneos -FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(PROJECT_DIR)/Carthage/Build/iOS/ $(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks +FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(PROJECT_DIR)/Carthage/Build $(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks +FRAMEWORK_SEARCH_PATHS[sdk=appletv*] = $(PROJECT_DIR)/Carthage/Build $(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks -FRAMEWORK_SEARCH_PATHS[sdk=appletv*] = $(PROJECT_DIR)/Carthage/Build/tvOS/ $(inherited) $(PLATFORM_DIR)/Developer/Library/Frameworks +IPHONEOS_DEPLOYMENT_TARGET = 10.0 +TVOS_DEPLOYMENT_TARGET = 10.0 -IPHONEOS_DEPLOYMENT_TARGET = 8.0 -TVOS_DEPLOYMENT_TARGET = 9.0 +DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES TARGETED_DEVICE_FAMILY = 1, 2, 3