Skip to content

Carthage: support from iOS 9.0 #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrMage merged 1 commit into from
Aug 13, 2018
Merged

Carthage: support from iOS 9.0 #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions SwiftGRPC-Carthage.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2172,18 +2172,18 @@
OBJ_1160 /* Products */ = {
isa = PBXGroup;
children = (
SwiftGRPC::Echo::Product /* Echo */,
SwiftProtobuf::protoc-gen-swift::Product /* protoc-gen-swift */,
SwiftGRPC::RootsEncoder::Product /* RootsEncoder */,
SwiftGRPC::Simple::Product /* Simple */,
SwiftProtobuf::SwiftProtobufPluginLibrary::Product /* SwiftProtobufPluginLibrary.framework */,
SwiftGRPC::SwiftGRPCTests::Product /* SwiftGRPCTests.xctest */,
SwiftGRPC::SwiftGRPC::Product /* SwiftGRPC.framework */,
SwiftProtobuf::SwiftProtobuf::Product /* SwiftProtobuf.framework */,
SwiftGRPC::BoringSSL::Product /* BoringSSL.framework */,
SwiftProtobuf::protoc-gen-swift::Product /* protoc-gen-swift */,
SwiftGRPC::Echo::Product /* Echo */,
SwiftGRPC::Simple::Product /* Simple */,
Commander::Commander::Product /* Commander.framework */,
SwiftGRPC::CgRPC::Product /* CgRPC.framework */,
SwiftProtobuf::SwiftProtobuf::Product /* SwiftProtobuf.framework */,
SwiftGRPC::protoc-gen-swiftgrpc::Product /* protoc-gen-swiftgrpc */,
SwiftGRPC::SwiftGRPCTests::Product /* SwiftGRPCTests.xctest */,
SwiftGRPC::CgRPC::Product /* CgRPC.framework */,
);
name = Products;
path = "";
Expand Down Expand Up @@ -4371,7 +4371,7 @@
isa = PBXNativeTarget;
buildConfigurationList = OBJ_2009 /* Build configuration list for PBXNativeTarget "SwiftProtobuf" */;
buildPhases = (
31CD0F748721B9677E261D1D /* ShellScript */,
9787213439CCFC4B91A030CE /* ShellScript */,
OBJ_2012 /* Sources */,
OBJ_2089 /* Frameworks */,
);
Expand Down Expand Up @@ -4412,7 +4412,7 @@
/* End PBXProject section */

/* Begin PBXShellScriptBuildPhase section */
31CD0F748721B9677E261D1D /* ShellScript */ = {
9787213439CCFC4B91A030CE /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand Down Expand Up @@ -5264,6 +5264,7 @@
"$(SRCROOT)/.build/checkouts/swift-nio-zlib-support.git--1071467962839356487",
);
INFOPLIST_FILE = "SwiftGRPC-Carthage.xcodeproj/BoringSSL_Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -5296,6 +5297,7 @@
"$(SRCROOT)/.build/checkouts/swift-nio-zlib-support.git--1071467962839356487",
);
INFOPLIST_FILE = "SwiftGRPC-Carthage.xcodeproj/BoringSSL_Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -5329,6 +5331,7 @@
"$(SRCROOT)/.build/checkouts/swift-nio-zlib-support.git--1071467962839356487",
);
INFOPLIST_FILE = "SwiftGRPC-Carthage.xcodeproj/CgRPC_Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -5362,6 +5365,7 @@
"$(SRCROOT)/.build/checkouts/swift-nio-zlib-support.git--1071467962839356487",
);
INFOPLIST_FILE = "SwiftGRPC-Carthage.xcodeproj/CgRPC_Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -5393,6 +5397,7 @@
"$(SRCROOT)/SwiftGRPC-Carthage.xcodeproj/GeneratedModuleMap/BoringSSL",
);
INFOPLIST_FILE = "SwiftGRPC-Carthage.xcodeproj/SwiftGRPC_Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand Down Expand Up @@ -5425,6 +5430,7 @@
"$(SRCROOT)/SwiftGRPC-Carthage.xcodeproj/GeneratedModuleMap/BoringSSL",
);
INFOPLIST_FILE = "SwiftGRPC-Carthage.xcodeproj/SwiftGRPC_Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
Expand All @@ -5451,6 +5457,7 @@
);
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "SwiftGRPC-Carthage.xcodeproj/SwiftProtobuf_Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = "$(inherited)";
Expand All @@ -5474,6 +5481,7 @@
);
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "SwiftGRPC-Carthage.xcodeproj/SwiftProtobuf_Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = "$(inherited)";
Expand Down
38 changes: 19 additions & 19 deletions SwiftGRPC-Carthage.xcodeproj/xcshareddata/xcschemes/SwiftGRPC-Carthage-Package.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,32 @@
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BuildableName = "'$(TARGET_NAME)'"
BlueprintName = "Echo"
BuildableName = "'lib$(TARGET_NAME)'"
BlueprintName = "SwiftGRPC"
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BuildableName = "'$(TARGET_NAME)'"
BlueprintName = "protoc-gen-swift"
BuildableName = "'lib$(TARGET_NAME)'"
BlueprintName = "SwiftProtobuf"
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BuildableName = "'$(TARGET_NAME)'"
BlueprintName = "Simple"
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BuildableName = "'lib$(TARGET_NAME)'"
BlueprintName = "SwiftProtobufPluginLibrary"
BlueprintName = "protoc-gen-swift"
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BuildableName = "'lib$(TARGET_NAME)'"
BlueprintName = "Commander"
BuildableName = "'$(TARGET_NAME)'"
BlueprintName = "Echo"
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -62,23 +54,23 @@
<BuildableReference
BuildableIdentifier = "primary"
BuildableName = "'lib$(TARGET_NAME)'"
BlueprintName = "SwiftGRPC"
BlueprintName = "BoringSSL"
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BuildableName = "'lib$(TARGET_NAME)'"
BlueprintName = "BoringSSL"
BuildableName = "'$(TARGET_NAME)'"
BlueprintName = "Simple"
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BuildableName = "'lib$(TARGET_NAME)'"
BlueprintName = "SwiftProtobuf"
BlueprintName = "Commander"
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -90,6 +82,14 @@
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BuildableName = "'lib$(TARGET_NAME)'"
BlueprintName = "SwiftProtobufPluginLibrary"
ReferencedContainer = "container:SwiftGRPC-Carthage.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Expand Down
1 change: 0 additions & 1 deletion remove-unwanted-targets-for-carthage.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
if !carthage_targets.include?(target.name)
targets_to_remove << target
else
puts target.name
target.build_configurations.each do |config|
config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = "9.0"
end
Expand Down