Norio Nomura 5 жил өмнө
parent
commit
d82019f517

+ 2 - 2
.github/workflows/swiftpm.yml

@@ -21,7 +21,7 @@ jobs:
   macOS:
     strategy:
       matrix:
-        xcode: ['9.4.1','10','10.1','10.2','10.2.1','10.3','11']
+        xcode: ['10','10.1','10.2','10.2.1','10.3','11']
     runs-on: macOS-10.14
     steps:
       - uses: actions/checkout@v1
@@ -32,7 +32,7 @@ jobs:
   Linux:
     strategy:
       matrix:
-        tag: ['4.1', '4.2', '5.0', '5.1']
+        tag: ['4.2', '5.0', '5.1']
     runs-on: ubuntu-latest
     container:
       image: norionomura/swift:${{ matrix.tag }}

+ 0 - 1
.github/workflows/xcodebuild.yml

@@ -24,7 +24,6 @@ jobs:
     strategy:
       matrix:
         xcode:
-          - version: '9.4.1'
           - version: '10'
             flag_for_test: -enableCodeCoverage YES -parallel-testing-enabled NO
           - version: '10.1'

+ 1 - 1
.swift-version

@@ -1 +1 @@
-4.1
+4.2

+ 3 - 2
Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.2
 import PackageDescription
 
 var package = Package(
@@ -9,7 +9,8 @@ var package = Package(
     targets: [
         .target(name: "Base32"),
         .testTarget(name: "Base32Tests", dependencies: ["Base32"])
-    ]
+    ],
+    swiftLanguageVersions: [.v4, .v4_2, .version("5")]
 )
 
 #if os(macOS)

+ 0 - 18
Package@swift-4.2.swift

@@ -1,18 +0,0 @@
-// swift-tools-version:4.2
-import PackageDescription
-
-var package = Package(
-    name: "Base32",
-    products: [
-      .library(name: "Base32", targets: ["Base32"])
-    ],
-    targets: [
-        .target(name: "Base32"),
-        .testTarget(name: "Base32Tests", dependencies: ["Base32"])
-    ],
-    swiftLanguageVersions: [.v4, .v4_2]
-)
-
-#if os(macOS)
-    package.targets.append(.testTarget(name: "SecEncodeTransformTests", dependencies: ["Base32"]))
-#endif

+ 0 - 18
Package@swift-5.swift

@@ -1,18 +0,0 @@
-// swift-tools-version:5.0
-import PackageDescription
-
-var package = Package(
-    name: "Base32",
-    products: [
-      .library(name: "Base32", targets: ["Base32"])
-    ],
-    targets: [
-        .target(name: "Base32"),
-        .testTarget(name: "Base32Tests", dependencies: ["Base32"])
-    ],
-    swiftLanguageVersions: [.v4, .v4_2, .v5]
-)
-
-#if os(macOS)
-    package.targets.append(.testTarget(name: "SecEncodeTransformTests", dependencies: ["Base32"]))
-#endif

+ 0 - 20
Sources/Base32/shim.swift

@@ -1,16 +1,5 @@
 import Foundation
 
-#if !swift(>=4.2)
-extension Collection {
-    public func firstIndex(
-        where predicate: (Element) throws -> Bool
-    ) rethrows -> Index? {
-        return try index(where: predicate)
-    }
-}
-#endif
-
-#if swift(>=4.2)
 #if !compiler(>=5)
 extension Data {
     func withUnsafeBytes<Result>(_ apply: (UnsafeRawBufferPointer) throws -> Result) rethrows -> Result {
@@ -20,12 +9,3 @@ extension Data {
     }
 }
 #endif
-#else
-extension Data {
-    func withUnsafeBytes<Result>(_ apply: (UnsafeRawBufferPointer) throws -> Result) rethrows -> Result {
-        return try withUnsafeBytes {
-            try apply(UnsafeRawBufferPointer(start: $0, count: count))
-        }
-    }
-}
-#endif