Skip to content

Commit

Permalink
Adjust carthage project
Browse files Browse the repository at this point in the history
  • Loading branch information
@dogo
dogo committed Oct 30, 2021
1 parent 8f32134 commit 47f364e
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Nimble_Snapshots.xcodeproj/xcuserdata/
# Carthage
Carthage/Checkouts
Carthage/Build
build

# Swift Package Manager
.swiftpm
Expand Down
56 changes: 45 additions & 11 deletions Nimble_Snapshots.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -16,15 +16,15 @@
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 */

/* Begin PBXFileReference section */
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 = "<group>"; };
095B47721D4773F000880922 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
095B47861D47761500880922 /* FBSnapshotTestCase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSnapshotTestCase.framework; path = Carthage/Build/iOS/FBSnapshotTestCase.framework; sourceTree = "<group>"; };
095B47871D47761500880922 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/iOS/Nimble.framework; sourceTree = "<group>"; };
095B478C1D47794300880922 /* HaveValidSnapshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HaveValidSnapshot.swift; sourceTree = "<group>"; };
095B478D1D47794300880922 /* CurrentTestCaseTracker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CurrentTestCaseTracker.swift; sourceTree = "<group>"; };
095B478E1D47794300880922 /* PrettySyntax.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrettySyntax.swift; sourceTree = "<group>"; };
Expand All @@ -35,6 +35,8 @@
D4F7D4781ED764CD00B4D2FE /* DynamicSizeSnapshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DynamicSizeSnapshot.swift; sourceTree = "<group>"; };
D4F7D47A1ED764CD00B4D2FE /* HaveValidDynamicTypeSnapshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HaveValidDynamicTypeSnapshot.swift; sourceTree = "<group>"; };
D4F7D47D1ED764CD00B4D2FE /* PrettyDynamicTypeSyntax.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrettyDynamicTypeSyntax.swift; sourceTree = "<group>"; };
DD078917272AE92500F605C3 /* FBSnapshotTestCase.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBSnapshotTestCase.xcframework; path = Carthage/Build/FBSnapshotTestCase.xcframework; sourceTree = "<group>"; };
DD078919272AE92A00F605C3 /* Nimble.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Nimble.xcframework; path = Carthage/Build/Nimble.xcframework; sourceTree = "<group>"; };
DD83832826E555BC0040266F /* NBSMockedApplication.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NBSMockedApplication.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -43,6 +45,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DD07891A272AE92A00F605C3 /* Nimble.xcframework in Frameworks */,
DD078918272AE92500F605C3 /* FBSnapshotTestCase.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -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 = "<group>";
};
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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)";
Expand All @@ -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)";
Expand Down
9 changes: 5 additions & 4 deletions Nimble_Snapshots/Nimble_Snapshots.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 47f364e

Please sign in to comment.