Bläddra i källkod

Updated SwiftPM Package for Swift 5 (#716)

* Updated SwiftPM package

For Swift 5

* Updated CI

* Updated CI
Alsey Coleman Miller 6 år sedan
förälder
incheckning
8757f2407e
4 ändrade filer med 52 tillägg och 8 borttagningar
  1. 12 6
      .travis.yml
  2. 4 2
      Package.swift
  3. 18 0
      Package@swift-4.2.swift
  4. 18 0
      Package@swift-5.swift

+ 12 - 6
.travis.yml

@@ -1,10 +1,16 @@
-os:
-    - linux
-    - osx
 language: generic
-sudo: required
-dist: trusty
-osx_image: xcode10
+matrix:
+   include:
+      # Test Ubuntu Linux 14.04 / Swift 4.1.2
+       - os: linux
+         dist: trusty
+         sudo: required
+      # Test Xcode 10 / Swift 4.2
+       - os: osx
+         osx_image: xcode10
+      # Test Xcode 10.2 / Swift 5
+       - os: osx
+         osx_image: xcode10.2
 install:
     - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
 script:

+ 4 - 2
Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:4.1
 
 import PackageDescription
 
@@ -13,4 +13,6 @@ let package = Package(
         .target(name: "CryptoSwift"),
         .testTarget(name: "Tests", dependencies: ["CryptoSwift"]),
         .testTarget(name: "TestsPerformance", dependencies: ["CryptoSwift"]),
-    ])
+    ],
+    swiftLanguageVersions: [4]
+)

+ 18 - 0
Package@swift-4.2.swift

@@ -0,0 +1,18 @@
+// swift-tools-version:4.2
+
+import PackageDescription
+
+let package = Package(
+    name: "CryptoSwift",
+    products: [
+        .library(
+            name: "CryptoSwift",
+            targets: ["CryptoSwift"])
+    ],
+    targets: [
+        .target(name: "CryptoSwift"),
+        .testTarget(name: "Tests", dependencies: ["CryptoSwift"]),
+        .testTarget(name: "TestsPerformance", dependencies: ["CryptoSwift"]),
+    ],
+    swiftLanguageVersions: [.v4, .v4_2]
+)

+ 18 - 0
Package@swift-5.swift

@@ -0,0 +1,18 @@
+// swift-tools-version:5.0
+
+import PackageDescription
+
+let package = Package(
+    name: "CryptoSwift",
+    products: [
+        .library(
+            name: "CryptoSwift",
+            targets: ["CryptoSwift"])
+    ],
+    targets: [
+        .target(name: "CryptoSwift"),
+        .testTarget(name: "Tests", dependencies: ["CryptoSwift"]),
+        .testTarget(name: "TestsPerformance", dependencies: ["CryptoSwift"]),
+    ],
+    swiftLanguageVersions: [.v5]
+)