Skip to content

Commit 18f8a82

Browse files
authored
Update CI rules; Official drop Swift 4.x (#72)
1 parent ee5880e commit 18f8a82

File tree

6 files changed

+27
-220
lines changed

6 files changed

+27
-220
lines changed

.travis.yml

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,58 +15,32 @@ matrix:
1515
dist: xenial
1616
sudo: required
1717
services: docker
18-
env: DOCKER_IMAGE=swift:4.0.3 SWIFT_SNAPSHOT=4.0.3
18+
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu16.04:5.1.5 SWIFT_SNAPSHOT=5.1.5
1919
- os: linux
20-
dist: xenial
21-
sudo: required
22-
services: docker
23-
env: DOCKER_IMAGE=swift:4.1.3 SWIFT_SNAPSHOT=4.1.3
24-
- os: linux
25-
dist: xenial
26-
sudo: required
27-
services: docker
28-
env: DOCKER_IMAGE=swift:4.2.4 SWIFT_SNAPSHOT=4.2.4
29-
- os: linux
30-
dist: xenial
31-
sudo: required
32-
services: docker
33-
env: DOCKER_IMAGE=swift:5.0.3-xenial SWIFT_SNAPSHOT=5.0.3
34-
- os: linux
35-
dist: xenial
20+
dist: bionic
3621
sudo: required
3722
services: docker
38-
env: DOCKER_IMAGE=swift:5.1
23+
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:5.4 SWIFT_SNAPSHOT=5.4
3924
- os: linux
4025
dist: xenial
4126
sudo: required
4227
services: docker
43-
env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
44-
- os: osx
45-
osx_image: xcode9.2
46-
sudo: required
47-
env: SWIFT_SNAPSHOT=4.0.3
48-
- os: osx
49-
osx_image: xcode9.4
50-
sudo: required
51-
env: SWIFT_SNAPSHOT=4.1.2
28+
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci-ubuntu18.04:latest SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
5229
- os: osx
53-
osx_image: xcode10.1
30+
osx_image: xcode11
5431
sudo: required
55-
env: SWIFT_SNAPSHOT=4.2.1
32+
env: SWIFT_SNAPSHOT=5.1.5 JAZZY_ELIGIBLE=true
5633
- os: osx
57-
osx_image: xcode10.2
34+
osx_image: xcode12.2
5835
sudo: required
59-
env: SWIFT_SNAPSHOT=5.0.1 JAZZY_ELIGIBLE=true
36+
#env: SWIFT_SNAPSHOT=5.1.5
6037
- os: osx
61-
osx_image: xcode11
62-
sudo: required
63-
- os: osx
64-
osx_image: xcode11
38+
osx_image: xcode12.5
6539
sudo: required
6640
env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
6741

6842
before_install:
69-
- git clone https://github.com/IBM-Swift/Package-Builder.git
43+
- git clone https://github.com/Kitura/Package-Builder.git
7044

7145
script:
7246
- ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR

BlueCryptor.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
Pod::Spec.new do |s|
22
s.name = "BlueCryptor"
3-
s.version = "1.0.32"
3+
s.version = "2.0.0"
44
s.summary = "Swift cross-platform crypto library using CommonCrypto/libcrypto via Package Manager."
5-
s.homepage = "https://github.com/IBM-Swift/BlueCryptor"
5+
s.homepage = "https://github.com/Kitura/BlueCryptor"
66
s.license = { :type => "Apache License, Version 2.0" }
7-
s.author = "IBM"
7+
s.author = "IBM & Kitura Project Authors"
88
s.module_name = 'Cryptor'
99

1010
s.requires_arc = true
1111
s.osx.deployment_target = "10.11"
1212
s.ios.deployment_target = "10.0"
1313
s.tvos.deployment_target = "10.0"
1414
s.watchos.deployment_target = "2.0"
15-
s.source = { :git => "https://github.com/IBM-Swift/BlueCryptor.git", :tag => s.version }
15+
s.source = { :git => "https://github.com/Kitura/BlueCryptor.git", :tag => s.version }
1616
s.source_files = "Sources/Cryptor/*.swift"
1717
s.pod_target_xcconfig = {
1818
'SWIFT_VERSION' => '5.0',

Package@swift-4.0.swift

Lines changed: 0 additions & 58 deletions
This file was deleted.

Package@swift-4.1.swift

Lines changed: 0 additions & 58 deletions
This file was deleted.

Package@swift-4.2.swift

Lines changed: 0 additions & 51 deletions
This file was deleted.

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<a href="https://www.kitura.io/packages.html#all">
33
<img src="https://img.shields.io/badge/docs-kitura.io-1FBCE4.svg" alt="APIDoc">
44
</a>
5-
<a href="https://travis-ci.org/IBM-Swift/BlueCryptor">
6-
<img src="https://travis-ci.org/IBM-Swift/BlueCryptor.svg?branch=master" alt="Build Status - Master">
5+
<a href="https://travis-ci.org/Kitura/BlueCryptor">
6+
<img src="https://travis-ci.org/Kitura/BlueCryptor.svg?branch=master" alt="Build Status - Master">
77
</a>
88
<img src="https://img.shields.io/badge/os-macOS-green.svg?style=flat" alt="macOS">
99
<img src="https://img.shields.io/badge/os-iOS-green.svg?style=flat" alt="iOS">
@@ -25,22 +25,22 @@ Swift cross-platform crypto library derived from [IDZSwiftCommonCrypto](https://
2525

2626
### Swift
2727

28-
* Swift Open Source `swift-4.0.0-RELEASE` toolchain (**Minimum REQUIRED for latest release**)
29-
* Swift Open Source `swift-4.2-RELEASE` toolchain (**Recommended**)
30-
* Swift toolchain included in *Xcode Version 10.0 (10A255) or higher*.
28+
* Swift Open Source `swift-5.1-RELEASE` toolchain (**Minimum REQUIRED for latest release**)
29+
* Swift Open Source `swift-5.4-RELEASE` toolchain (**Recommended**)
30+
* Swift toolchain included in *Xcode Version 11.0 or higher*.
3131

3232
### macOS
3333

34-
* macOS 10.11.6 (*El Capitan*) or higher.
35-
* Xcode Version 9.0 or higher using one of the above toolchains.
36-
* Xcode Version 10.0 (10A255) or higher using the included toolchain (*Recommended*).
34+
* macOS 10.14.6 (*Mojave*) or higher.
35+
* Xcode Version 11.0 or higher using one of the above toolchains.
36+
* Xcode Version 12.5 or higher using the included toolchain (*Recommended*).
3737
* CommonCrypto is provided by macOS.
3838

3939
### iOS
4040

4141
* iOS 10.0 or higher
42-
* Xcode Version 9.0 or higher using one of the above toolchains.
43-
* Xcode Version 10.0 (10A255) or higher using the included toolchain (*Recommended*).
42+
* Xcode Version 11.0 or higher using one of the above toolchains.
43+
* Xcode Version 12.5 or higher using the included toolchain (*Recommended*).
4444
* CommonCrypto is provided by iOS.
4545

4646
### Linux
@@ -78,14 +78,14 @@ To run the supplied unit tests for **Cryptor** from the command line:
7878
To include BlueCryptor into a Swift Package Manager package, add it to the `dependencies` attribute defined in your `Package.swift` file. You can select the version using the `majorVersion` and `minor` parameters. For example:
7979
```
8080
dependencies: [
81-
.Package(url: "https://github.com/IBM-Swift/BlueCryptor.git", majorVersion: <majorVersion>, minor: <minor>)
81+
.Package(url: "https://github.com/Kitura/BlueCryptor.git", majorVersion: <majorVersion>, minor: <minor>)
8282
]
8383
```
8484

8585
#### Carthage
8686
To include BlueCryptor in a project using Carthage, add a line to your `Cartfile` with the GitHub organization and project names and version. For example:
8787
```
88-
github "IBM-Swift/BlueCryptor" ~> <majorVersion>.<minor>
88+
github "Kitura/BlueCryptor" ~> <majorVersion>.<minor>
8989
```
9090

9191
#### CocoaPods
@@ -232,4 +232,4 @@ We love to talk server-side Swift and Kitura. Join our [Slack](http://swift-at-i
232232

233233
## License
234234

235-
This library is licensed under Apache 2.0. Full license text is available in [LICENSE](https://github.com/IBM-Swift/BlueCryptor/blob/master/LICENSE).
235+
This library is licensed under Apache 2.0. Full license text is available in [LICENSE](https://github.com/Kitura/BlueCryptor/blob/master/LICENSE).

0 commit comments

Comments
 (0)