Merge pull request #85 from ellneal/master

Add Swift 5.1 support on Linux
nerdishbynature · Dec 14, 2019 · 9ad4d6e · 9ad4d6e
2 parents c51137d + 1149393
commit 9ad4d6e
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: generic
-osx_image: xcode9.2
+osx_image: xcode10.2
 sudo: false
 env:
   global:
@@ -11,15 +11,19 @@ matrix:
     - os: osx
       env: FASTLANE_LANE=code_coverage FASTLANE_ENV=default
     - os: osx
-      env: FASTLANE_ENV=ios93
+      env: FASTLANE_ENV=ios12_2
     - os: osx
-      env: FASTLANE_ENV=tvos92
+      env: FASTLANE_ENV=tvos12_2
     - os: osx
       env: FASTLANE_ENV=osx
     - os: linux
       sudo: required
       dist: trusty
       env: SWIFT_VERSION=4.2
+    - os: linux
+      sudo: required
+      dist: trusty
+      env: SWIFT_VERSION=5.1
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./Script/travis-install-linux; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./Script/travis-install-macos; fi

diff --git a/OctoKit/Configuration.swift b/OctoKit/Configuration.swift
@@ -1,5 +1,8 @@
 import Foundation
 import RequestKit
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 public let githubBaseURL = "https://api.github.com"
 public let githubWebURL = "https://github.com"
@@ -126,7 +129,13 @@ enum OAuthRouter: Router {
         }
     }
 
-    var URLRequest: Foundation.URLRequest? {
+#if canImport(FoundationNetworking)
+    typealias FoundationURLRequestType = FoundationNetworking.URLRequest
+#else
+    typealias FoundationURLRequestType = Foundation.URLRequest
+#endif
+
+    var URLRequest: FoundationURLRequestType? {
         switch self {
         case .authorize(let config):
             let url = URL(string: path, relativeTo: URL(string: config.webEndpoint)!)

diff --git a/OctoKit/Follow.swift b/OctoKit/Follow.swift
@@ -1,5 +1,8 @@
 import Foundation
 import RequestKit
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 public extension Octokit {
 

diff --git a/OctoKit/Gist.swift b/OctoKit/Gist.swift
@@ -1,5 +1,8 @@
 import Foundation
 import RequestKit
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 // MARK: model
 

diff --git a/OctoKit/Issue.swift b/OctoKit/Issue.swift
@@ -1,5 +1,8 @@
 import Foundation
 import RequestKit
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 // MARK: model
 

diff --git a/OctoKit/Label.swift b/OctoKit/Label.swift
@@ -1,5 +1,8 @@
 import Foundation
 import RequestKit
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 open class Label: Codable {
     open var url: URL?

diff --git a/OctoKit/PublicKey.swift b/OctoKit/PublicKey.swift
@@ -1,5 +1,8 @@
 import Foundation
 import RequestKit
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 // MARK: request
 

diff --git a/OctoKit/PullRequest.swift b/OctoKit/PullRequest.swift
@@ -1,5 +1,8 @@
 import Foundation
 import RequestKit
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 open class PullRequest: Codable {
     private(set) open var id: Int = -1

diff --git a/OctoKit/Repositories.swift b/OctoKit/Repositories.swift
@@ -1,5 +1,8 @@
 import Foundation
 import RequestKit
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 // MARK: model
 open class Repository: Codable {

diff --git a/OctoKit/Stars.swift b/OctoKit/Stars.swift
@@ -1,5 +1,8 @@
 import Foundation
 import RequestKit
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 public extension Octokit {
 

diff --git a/OctoKit/User.swift b/OctoKit/User.swift
@@ -1,5 +1,8 @@
 import Foundation
 import RequestKit
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 // MARK: model
 open class User: Codable {

diff --git a/Script/travis-install-macos b/Script/travis-install-macos
@@ -1,4 +1,3 @@
 #!/usr/bin/env sh
-sudo gem install bundler
 bundle install
 make install
diff --git a/Tests/OctoKitTests/OctoKitURLTestSession.swift b/Tests/OctoKitTests/OctoKitURLTestSession.swift
@@ -1,5 +1,8 @@
 import RequestKit
 import XCTest
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 class MockURLSessionDataTask: URLSessionDataTaskProtocol {
     fileprivate (set) var resumeWasCalled = false

diff --git a/fastlane/.env.default b/fastlane/.env.default
@@ -1,13 +1,12 @@
-AF_IOS_SDK=iphonesimulator11.2
-AF_MAC_SDK=macosx10.13
-AF_TVOS_SDK=appletvsimulator11.2
+AF_IOS_SDK=iphonesimulator12.2
+AF_MAC_SDK=macosx10.14
+AF_TVOS_SDK=appletvsimulator12.2
 
 AF_CONFIGURATION=Release
 
 SCAN_SCHEME=$AF_IOS_FRAMEWORK_SCHEME
 SCAN_SDK=$AF_IOS_SDK
 SCAN_OUTPUT_DIRECTORY=fastlane/test-output
-DEPLOY_PODSPEC=OctoKit.swift.podspec
 
 EXAMPLE_WORKSPACE=$AF_WORKSPACE
 EXAMPLE_SCHEME=$AF_IOS_EXAMPLE_SCHEME

diff --git a/fastlane/.env.ios12_2 b/fastlane/.env.ios12_2
@@ -0,0 +1,3 @@
+SCAN_DEVICE="iPhone 8"
+SCAN_SDK=$AF_IOS_SDK
+EXAMPLE_DESTINATION="platform=iOS Simulator,name=iPhone 8"
diff --git a/fastlane/.env.ios93 b/fastlane/.env.ios93
diff --git a/fastlane/.env.tvos92 → fastlane/.env.tvos12_2 b/fastlane/.env.tvos92 → fastlane/.env.tvos12_2