Skip to content

Commit 72318f3

Browse files
authored
Remove support for Swift 4.x; Update CI builds (#95)
* Update CI rules. Remove Swift 4.x from testing * Remove Package files for Swift 4.x * Update travis env for specifying swift development snapshot. * remove execute flag on podspec * Update podspec * README: Update minimum toolchain versions * Add note for older versions of swift
1 parent c2f4926 commit 72318f3

File tree

8 files changed

+24
-264
lines changed

8 files changed

+24
-264
lines changed

.travis.yml

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -15,58 +15,31 @@ 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
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
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 USE_SWIFT_DEVELOPMENT_SNAPSHOT=1
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
6036
- os: osx
61-
osx_image: xcode11
62-
sudo: required
63-
- os: osx
64-
osx_image: xcode11
37+
osx_image: xcode12.5
6538
sudo: required
66-
env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
39+
env: USE_SWIFT_DEVELOPMENT_SNAPSHOT=1
6740

6841
before_install:
69-
- git clone https://github.com/IBM-Swift/Package-Builder.git
42+
- git clone https://github.com/Kitura/Package-Builder.git
7043

7144
script:
7245
- ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR

BlueSSLService.podspec

100755100644
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "BlueSSLService"
3-
s.version = "1.0.200"
3+
s.version = "2.0.0"
44
s.summary = "SSL/TLS Add-in framework for BlueSocket in Swift"
55
s.homepage = "https://github.com/Kitura/BlueSSLService"
66
s.license = { :type => "Apache License, Version 2.0" }
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
1313
s.tvos.deployment_target = "10.0"
1414
s.source = { :git => "https://github.com/Kitura/BlueSSLService.git", :tag => s.version }
1515
s.source_files = "Sources/SSLService/*.swift"
16-
s.dependency 'BlueSocket', '~> 1.0.52'
16+
s.dependency 'BlueSocket', '~> 2.0.0'
1717
s.pod_target_xcconfig = {
1818
'SWIFT_VERSION' => '5.1',
1919
}

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "IBM-Swift/BlueSocket"
1+
github "Kitura/BlueSocket"

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import PackageDescription
2424

2525
#if os(Linux) || os(macOS) || os(iOS) || os(tvOS)
2626

27-
var packageDependencies: [Package.Dependency] = [.package(url: "https://github.com/Kitura/BlueSocket.git", from: "1.0.200")]
27+
var packageDependencies: [Package.Dependency] = [.package(url: "https://github.com/Kitura/BlueSocket.git", from: "2.0.0")]
2828
var targetDependencies: [Target.Dependency] = [.byName(name: "Socket")]
2929

3030
#if os(Linux)

Package@swift-4.0.swift

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

Package@swift-4.1.swift

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

Package@swift-4.2.swift

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

README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,24 @@ SSL/TLS Add-in framework for [BlueSocket](https://github.com/Kitura/BlueSocket.g
2222

2323
### Swift
2424

25-
* Swift Open Source `swift-4.0.0-RELEASE` toolchain (**Minimum REQUIRED for latest release**)
26-
* Swift Open Source `swift-4.2-RELEASE` toolchain (**Recommended**)
27-
* Swift toolchain included in *Xcode Version 10.0 (10A255) or higher*.
25+
* Swift Open Source `swift-5.1-RELEASE` toolchain (**Minimum REQUIRED for latest release**)
26+
* Swift Open Source `swift-5.4-RELEASE` toolchain (**Recommended**)
27+
* Swift toolchain included in *Xcode Version 11.0 or higher*.
28+
29+
BlueSSLService version 2.0 and above supports Swift 5.1+. See older versions of BlueSSLService for older versions of Swift.
2830

2931
### macOS
3032

31-
* macOS 10.11.6 (*El Capitan*) or higher.
32-
* Xcode Version 9.0 (9A325) or higher using one of the above toolchains.
33-
* Xcode Version 10.0 (10A255) or higher using the included toolchain (*Recommended*).
33+
* macOS 10.14.6 (*Mojave*) or higher.
34+
* Xcode Version 11.0 or higher using one of the above toolchains.
35+
* Xcode Version 12.5 or higher using the included toolchain (*Recommended*).
3436
* Secure Transport is provided by macOS.
3537

3638
### iOS
3739

3840
* iOS 10.0 or higher
39-
* Xcode Version 9.0 (9A325) or higher using one of the above toolchains.
40-
* Xcode Version 10.0 (10A255) or higher using the included toolchain (*Recommended*).
41+
* Xcode Version 11.0 or higher using one of the above toolchains.
42+
* Xcode Version 12.5 or higher using the included toolchain (*Recommended*).
4143
* Secure Transport is provided by iOS.
4244

4345
### Linux

0 commit comments

Comments
 (0)