Merge pull request #231 from pvzig/master

Build setting fixes for tvOS
albert-heijn-technology · Mar 19, 2017 · fdc2cff · fdc2cff
2 parents 29579e2 + b944bbc
commit fdc2cff
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/Sources/Swifter/Socket+File.swift b/Sources/Swifter/Socket+File.swift
@@ -12,7 +12,7 @@
 #endif
 
 
-#if os(iOS) || os (Linux)
+#if os(iOS) || os(tvOS) || os (Linux)
 
     struct sf_hdtr { }
 
@@ -40,7 +40,7 @@
 
 #endif
 
-#if os(iOS) || os (Linux)
+#if os(iOS) || os(tvOS) || os (Linux)
 
 extension Socket {
 

diff --git a/XCode/Swifter.xcodeproj/project.pbxproj b/XCode/Swifter.xcodeproj/project.pbxproj
@@ -321,7 +321,7 @@
 		7CCD1B701C8F7CEC0016D664 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		7CCD1B7F1C8F7E520016D664 /* SwiftertvOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwiftertvOS.h; sourceTree = "<group>"; };
 		7CCD1B811C8F7E520016D664 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		7CCD1BC41C8F84E60016D664 /* SwiftertvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftertvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		7CCD1BC41C8F84E60016D664 /* Swifter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Swifter.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7CCD1BC51C8F84E60016D664 /* SwifteriOS copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "SwifteriOS copy-Info.plist"; path = "/Users/damiankolakowski/Desktop/swifter/SwifteriOS copy-Info.plist"; sourceTree = "<absolute>"; };
 		7CCD875C1C66099B0068099B /* SwifteriOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwifteriOSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		7CCD87601C66099B0068099B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -510,7 +510,7 @@
 				7CCD875C1C66099B0068099B /* SwifteriOSTests.xctest */,
 				7CCD87791C660EA30068099B /* SwifterOSXTests.xctest */,
 				7CCD1B651C8F7CEC0016D664 /* SwifterSampletvOS.app */,
-				7CCD1BC41C8F84E60016D664 /* SwiftertvOS.framework */,
+				7CCD1BC41C8F84E60016D664 /* Swifter.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -761,7 +761,7 @@
 			);
 			name = SwiftertvOS;
 			productName = SwifteriOS;
-			productReference = 7CCD1BC41C8F84E60016D664 /* SwiftertvOS.framework */;
+			productReference = 7CCD1BC41C8F84E60016D664 /* Swifter.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 		7CCD875B1C66099B0068099B /* SwifteriOSTests */ = {
@@ -1568,13 +1568,14 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = pl.kolakowski.SwiftertvOS;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = Swifter;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 3;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1599,13 +1600,14 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = pl.kolakowski.SwiftertvOS;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = Swifter;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 3;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};

diff --git a/XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwiftertvOS.xcscheme b/XCode/Swifter.xcodeproj/xcshareddata/xcschemes/SwiftertvOS.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "7CCD1BA81C8F84E60016D664"
-               BuildableName = "SwiftertvOS.framework"
+               BuildableName = "Swifter.framework"
                BlueprintName = "SwiftertvOS"
                ReferencedContainer = "container:Swifter.xcodeproj">
             </BuildableReference>
@@ -46,7 +46,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "7CCD1BA81C8F84E60016D664"
-            BuildableName = "SwiftertvOS.framework"
+            BuildableName = "Swifter.framework"
             BlueprintName = "SwiftertvOS"
             ReferencedContainer = "container:Swifter.xcodeproj">
          </BuildableReference>
@@ -64,7 +64,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "7CCD1BA81C8F84E60016D664"
-            BuildableName = "SwiftertvOS.framework"
+            BuildableName = "Swifter.framework"
             BlueprintName = "SwiftertvOS"
             ReferencedContainer = "container:Swifter.xcodeproj">
          </BuildableReference>