Skip to content

Commit e329e0c

Browse files
committed
Migrate (somewhat) to Swift 5.0
I am unable to perform automatic migration using Xcode 10.2, since my macbook doesn't support that version of Xcode, so I installed Swift 5.0 toolchain and performed most of the steps manually.
1 parent b05d179 commit e329e0c

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2
1+
5.0

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
- stage: test
77
language: swift
88
os: osx
9-
osx_image: xcode10.1
9+
osx_image: xcode10.2
1010
before_install:
1111
- brew update
1212
install:
@@ -26,7 +26,7 @@ jobs:
2626
if: tag IS present
2727
language: generic
2828
os: osx
29-
osx_image: xcode10.1
29+
osx_image: xcode10.2
3030
env:
3131
secure: iavIkrus2Xd3b086nz2srMGl52yqzLuCdhyEAhMODVqkzqMQ17s10y1TNb+vkepd0HgxI9j57d5X7tfChjWuWDwE2hZKjr/Kx2DfiUr1AKQD6ymuGrq/0Vv6yL9dfPU8goFArcrsBcyVKczLtTuLCKL498ZqokkQc/3kGvzW74lv+z410MfHS9/tvToO/yXJckL6qJ2XBAiElfOO0rEkllTeCo6N3bjcHZ2o7PE0K+CHYxwNKj0TmPmuNWZ3U4fzoWzkk01re1C1l5cpSb20g+2aGyi0yYX+PomX7fIIqNq9vmmyoeNdr35yqoQv/0zFeFnps83NKmZLAjSUhiUdhlbuBLBE+w8544LOaZnMDlFmpDjgyaVnRrOh0NrBB1FwU48aGfX5ljRQmk/07FTEUjvwvGGoOpz8lrLZi148FMHEospL3Sf7d8K+Q9WdtLTGk7HCnbOVcxS6oB/SWF/Cj6n5wu+EI1floBaZEsNPR40Gd4eM/Ik/E3lDrZThGDCWQsao981wm7IfEDBR1nuMME8gpZINFANNS1+5miFaGdTnDTp4Yd5MGEFZm+K8x+TG1891NwNH1ZmKXlypJXiUzvSjbh2ViNJGekdQj9q2gj2ZFlCfHJ05adwJ4w9qRuF00HpAOD6At6EnsjDXFJeTZS5dj8fi2YsU9or8KfTFoNY=
3232
addons:

Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.0
1+
// swift-tools-version:5.0
22
import PackageDescription
33

44
let package = Package(
@@ -28,5 +28,5 @@ let package = Package(
2828
path: "Sources",
2929
sources: ["Common", "7-Zip", "BZip2", "Deflate", "GZip", "LZMA", "LZMA2", "TAR", "XZ", "ZIP", "Zlib"]),
3030
],
31-
swiftLanguageVersions: [4]
31+
swiftLanguageVersions: [.v5]
3232
)

SWCompression.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
2020
s.tvos.deployment_target = "9.0"
2121
s.watchos.deployment_target = "2.0"
2222

23-
s.swift_version = "4.2"
23+
s.swift_version = "5.0"
2424

2525
s.dependency "BitByteData", "~> 1.4.0"
2626

SWCompression.xcodeproj/project.pbxproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -1265,6 +1265,7 @@
12651265
SDKROOT = macosx;
12661266
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos";
12671267
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1268+
SWIFT_VERSION = 5.0;
12681269
TVOS_DEPLOYMENT_TARGET = 9.0;
12691270
VERSIONING_SYSTEM = "apple-generic";
12701271
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1319,6 +1320,7 @@
13191320
SDKROOT = macosx;
13201321
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
13211322
SWIFT_COMPILATION_MODE = wholemodule;
1323+
SWIFT_VERSION = 5.0;
13221324
TVOS_DEPLOYMENT_TARGET = 9.0;
13231325
VERSIONING_SYSTEM = "apple-generic";
13241326
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1349,7 +1351,6 @@
13491351
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.SWCompression;
13501352
PRODUCT_NAME = "$(TARGET_NAME)";
13511353
SKIP_INSTALL = YES;
1352-
SWIFT_VERSION = 4.2;
13531354
};
13541355
name = Debug;
13551356
};
@@ -1377,7 +1378,6 @@
13771378
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.SWCompression;
13781379
PRODUCT_NAME = "$(TARGET_NAME)";
13791380
SKIP_INSTALL = YES;
1380-
SWIFT_VERSION = 4.2;
13811381
};
13821382
name = Release;
13831383
};
@@ -1395,7 +1395,6 @@
13951395
);
13961396
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.TestSWCompression;
13971397
PRODUCT_NAME = "$(TARGET_NAME)";
1398-
SWIFT_VERSION = 4.2;
13991398
};
14001399
name = Debug;
14011400
};
@@ -1413,7 +1412,6 @@
14131412
);
14141413
PRODUCT_BUNDLE_IDENTIFIER = me.tsolomko.TestSWCompression;
14151414
PRODUCT_NAME = "$(TARGET_NAME)";
1416-
SWIFT_VERSION = 4.2;
14171415
};
14181416
name = Release;
14191417
};

0 commit comments

Comments
 (0)