fix CI

dduan · Sep 17, 2016 · 1169615 · 1169615
1 parent 50c6385
commit 1169615
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/Just.xcodeproj/project.pbxproj b/Just.xcodeproj/project.pbxproj
@@ -637,7 +637,6 @@
 				);
 				INFOPLIST_FILE = "JustTests/Just-OSXTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "net.justHTTP.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -655,7 +654,6 @@
 				);
 				INFOPLIST_FILE = "JustTests/Just-OSXTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "net.justHTTP.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -818,7 +816,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.JustHTTP.Just-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Debug;
 		};
@@ -831,7 +828,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.JustHTTP.Just-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Release;
 		};

diff --git a/JustTests/JustTests.swift b/JustTests/JustTests.swift
@@ -710,16 +710,16 @@ final class LinkHeader: XCTestCase {
     var url = "https://api.github.com/users/dduan/repos?page=1&per_page=10"
     if let token = ProcessInfo.processInfo.environment["GITHUB_TOKEN"] {
       url = url+"&access_token=\(token)"
-    }
 
-    let r = Just.get(url)
+      let r = Just.get(url)
 
-    XCTAssertTrue(r.ok)
-    XCTAssertNotNil(r.links)
-    XCTAssertNotNil(r.links["next"])
-    XCTAssertNotNil(r.links["last"])
-    XCTAssertNotNil(r.links["next"]?["url"])
-    XCTAssertNotNil(r.links["last"]?["url"])
+      XCTAssertTrue(r.ok)
+      XCTAssertNotNil(r.links)
+      XCTAssertNotNil(r.links["next"])
+      XCTAssertNotNil(r.links["last"])
+      XCTAssertNotNil(r.links["next"]?["url"])
+      XCTAssertNotNil(r.links["last"]?["url"])
+    }
   }
 }
 

diff --git a/Makefile b/Makefile
@@ -6,8 +6,7 @@ test :
 	@set -o pipefail \
 	&& xcodebuild test -workspace Just.xcworkspace -scheme Just-OSX -destination 'platform=OS X' | xcpretty \
 	&& xcodebuild test -workspace Just.xcworkspace -scheme Just-iOS -destination 'OS=9.1,name=iPhone 6 Plus' | xcpretty \
-	&& xcodebuild test -workspace Just.xcworkspace -scheme Just-tvOS -destination 'OS=9.0,name=Apple TV 1080p' | xcpretty \
-	&& pod lib lint
+	&& xcodebuild test -workspace Just.xcworkspace -scheme Just-tvOS -destination 'OS=10.0,name=Apple TV 1080p' | xcpretty \
 
 playground :
 	@mkdir -p Docs/QuickStart.playground/Sources