Skip to content

Commit 88ab337

Browse files
committed
Xcode 14-related updates: drop support for swift 5.1, increase deployment targets on darwin platforms, enable dead code stripping and eager linking in xcode project, add swift 5.7 to CI, update macos-10.15 to macos-11 and ubuntu-18.04 to ubuntu-20.04 in CI due to deprecations
1 parent 1de0d9b commit 88ab337

File tree

6 files changed

+49
-41
lines changed

6 files changed

+49
-41
lines changed

Package.swift

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

44
let package = Package(

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SWCompression
22

3-
[![Swift 5.1+](https://img.shields.io/badge/Swift-5.1+-blue.svg)](https://developer.apple.com/swift/)
3+
[![Swift 5.2+](https://img.shields.io/badge/Swift-5.2+-blue.svg)](https://developer.apple.com/swift/)
44
[![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/tsolomko/SWCompression/master/LICENSE)
55
[![Build Status](https://dev.azure.com/tsolomko/SWCompression/_apis/build/status/tsolomko.SWCompression?branchName=develop)](https://dev.azure.com/tsolomko/SWCompression/_build/latest?definitionId=3&branchName=develop)
66

@@ -19,7 +19,7 @@ It also works on Apple platforms, Linux, __and Windows__.
1919
All features are listed in the tables below. "TBD" means that feature is planned but not implemented (yet).
2020

2121
| | Deflate | BZip2 | LZMA/LZMA2 | LZ4 |
22-
| ------------- | ------- | ----- | ---------- | --- |
22+
| ------------- | ------- | ----- | ---------- | --- |
2323
| Decompression |||||
2424
| Compression ||| TBD ||
2525

SWCompression.podspec

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Pod::Spec.new do |s|
1515

1616
s.source = { :git => "https://github.com/tsolomko/SWCompression.git", :tag => "#{s.version}" }
1717

18-
s.ios.deployment_target = "9.0"
19-
s.osx.deployment_target = "10.10"
20-
s.tvos.deployment_target = "9.0"
21-
s.watchos.deployment_target = "2.0"
18+
s.ios.deployment_target = "11.0"
19+
s.osx.deployment_target = "10.13"
20+
s.tvos.deployment_target = "11.0"
21+
s.watchos.deployment_target = "4.0"
2222

2323
s.swift_versions = ["5"]
2424

SWCompression.xcodeproj/project.pbxproj

+13-9
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@
11381138
isa = PBXProject;
11391139
attributes = {
11401140
LastSwiftUpdateCheck = 0920;
1141-
LastUpgradeCheck = 1340;
1141+
LastUpgradeCheck = 1400;
11421142
ORGANIZATIONNAME = "Timofey Solomko";
11431143
TargetAttributes = {
11441144
06BE1AC71DB410F100EE0F59 = {
@@ -1517,7 +1517,9 @@
15171517
CLANG_WARN_UNREACHABLE_CODE = YES;
15181518
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
15191519
CURRENT_PROJECT_VERSION = 86;
1520+
DEAD_CODE_STRIPPING = YES;
15201521
DEBUG_INFORMATION_FORMAT = dwarf;
1522+
EAGER_LINKING = YES;
15211523
ENABLE_STRICT_OBJC_MSGSEND = YES;
15221524
ENABLE_TESTABILITY = YES;
15231525
"FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = (
@@ -1556,8 +1558,8 @@
15561558
GCC_WARN_UNINITIALIZED_AUTOS = YES;
15571559
GCC_WARN_UNUSED_FUNCTION = YES;
15581560
GCC_WARN_UNUSED_VARIABLE = YES;
1559-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1560-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1561+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1562+
MACOSX_DEPLOYMENT_TARGET = 10.13;
15611563
ONLY_ACTIVE_ARCH = YES;
15621564
OTHER_CODE_SIGN_FLAGS = "--deep";
15631565
OTHER_LDFLAGS = (
@@ -1568,9 +1570,9 @@
15681570
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos";
15691571
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
15701572
SWIFT_VERSION = 5.0;
1571-
TVOS_DEPLOYMENT_TARGET = 9.0;
1573+
TVOS_DEPLOYMENT_TARGET = 11.0;
15721574
VERSIONING_SYSTEM = "apple-generic";
1573-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
1575+
WATCHOS_DEPLOYMENT_TARGET = 4.0;
15741576
};
15751577
name = Debug;
15761578
};
@@ -1598,7 +1600,9 @@
15981600
CLANG_WARN_UNREACHABLE_CODE = YES;
15991601
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
16001602
CURRENT_PROJECT_VERSION = 86;
1603+
DEAD_CODE_STRIPPING = YES;
16011604
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1605+
EAGER_LINKING = YES;
16021606
ENABLE_STRICT_OBJC_MSGSEND = YES;
16031607
"FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = (
16041608
"\"$(SRCROOT)/Carthage/Build/tvOS\"",
@@ -1635,8 +1639,8 @@
16351639
GCC_WARN_UNINITIALIZED_AUTOS = YES;
16361640
GCC_WARN_UNUSED_FUNCTION = YES;
16371641
GCC_WARN_UNUSED_VARIABLE = YES;
1638-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1639-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1642+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1643+
MACOSX_DEPLOYMENT_TARGET = 10.13;
16401644
OTHER_CODE_SIGN_FLAGS = "--deep";
16411645
OTHER_LDFLAGS = (
16421646
"-framework",
@@ -1646,9 +1650,9 @@
16461650
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos";
16471651
SWIFT_COMPILATION_MODE = wholemodule;
16481652
SWIFT_VERSION = 5.0;
1649-
TVOS_DEPLOYMENT_TARGET = 9.0;
1653+
TVOS_DEPLOYMENT_TARGET = 11.0;
16501654
VERSIONING_SYSTEM = "apple-generic";
1651-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
1655+
WATCHOS_DEPLOYMENT_TARGET = 4.0;
16521656
};
16531657
name = Release;
16541658
};

SWCompression.xcodeproj/xcshareddata/xcschemes/SWCompression.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1340"
3+
LastUpgradeVersion = "1400"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

azure-pipelines.yml

+28-24
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,13 @@ stages:
1515
- job: macos
1616
strategy:
1717
matrix:
18-
macosSwift51:
19-
imageName: 'macOS-10.15'
20-
DEVELOPER_DIR: '/Applications/Xcode_11.3.1.app'
21-
WATCHOS_ACTIONS: 'clean build'
22-
WATCHOS_SIMULATOR: 'Apple Watch Series 4 - 44mm'
2318
macosSwift52:
24-
imageName: 'macOS-10.15'
25-
DEVELOPER_DIR: '/Applications/Xcode_11.4.1.app'
19+
imageName: 'macOS-11'
20+
DEVELOPER_DIR: '/Applications/Xcode_11.7.app'
2621
WATCHOS_ACTIONS: 'clean build'
2722
WATCHOS_SIMULATOR: 'Apple Watch Series 4 - 44mm'
2823
macosSwift53:
29-
imageName: 'macOS-10.15'
24+
imageName: 'macOS-11'
3025
DEVELOPER_DIR: '/Applications/Xcode_12.4.app'
3126
WATCHOS_ACTIONS: 'clean build'
3227
WATCHOS_SIMULATOR: 'Apple Watch Series 4 - 44mm'
@@ -45,10 +40,16 @@ stages:
4540
UTILS_PW_XCF_FLAG: '--xcf'
4641
macosSwift56:
4742
imageName: 'macOS-12'
48-
DEVELOPER_DIR: '/Applications/Xcode_13.4.app'
43+
DEVELOPER_DIR: '/Applications/Xcode_13.4.1.app'
4944
WATCHOS_ACTIONS: 'clean test'
5045
WATCHOS_SIMULATOR: 'Apple Watch Series 6 - 44mm'
5146
UTILS_PW_XCF_FLAG: '--xcf'
47+
macosSwift57:
48+
imageName: 'macOS-12'
49+
DEVELOPER_DIR: '/Applications/Xcode_14.0.app'
50+
WATCHOS_ACTIONS: 'clean test'
51+
WATCHOS_SIMULATOR: 'Apple Watch Series 6 (44mm)'
52+
UTILS_PW_XCF_FLAG: '--xcf'
5253
pool:
5354
vmImage: $(imageName)
5455
variables:
@@ -90,24 +91,24 @@ stages:
9091
- job: linux
9192
strategy:
9293
matrix:
93-
linuxSwift51:
94-
imageName: 'ubuntu-18.04'
95-
containerImage: 'swift:5.1.5-bionic'
9694
linuxSwift52:
97-
imageName: 'ubuntu-18.04'
98-
containerImage: 'swift:5.2.5-bionic'
95+
imageName: 'ubuntu-20.04'
96+
containerImage: 'swift:5.2.5-focal'
9997
linuxSwift53:
100-
imageName: 'ubuntu-18.04'
101-
containerImage: 'swift:5.3.3-bionic'
98+
imageName: 'ubuntu-20.04'
99+
containerImage: 'swift:5.3.3-focal'
102100
linuxSwift54:
103-
imageName: 'ubuntu-18.04'
104-
containerImage: 'swift:5.4.3-bionic'
101+
imageName: 'ubuntu-20.04'
102+
containerImage: 'swift:5.4.3-focal'
105103
linuxSwift55:
106-
imageName: 'ubuntu-18.04'
107-
containerImage: 'swift:5.5.3-bionic'
104+
imageName: 'ubuntu-20.04'
105+
containerImage: 'swift:5.5.3-focal'
108106
linuxSwift56:
109-
imageName: 'ubuntu-18.04'
110-
containerImage: 'swift:5.6.1-bionic'
107+
imageName: 'ubuntu-20.04'
108+
containerImage: 'swift:5.6.3-focal'
109+
linuxSwift57:
110+
imageName: 'ubuntu-20.04'
111+
containerImage: 'swift:5.7-focal'
111112
pool:
112113
vmImage: $(imageName)
113114
container: $[ variables['containerImage'] ]
@@ -129,7 +130,10 @@ stages:
129130
SWIFT_VERSION: '5.5.3'
130131
# windowsSwift56:
131132
# imageName: 'windows-2019'
132-
# SWIFT_VERSION: '5.6.1'
133+
# SWIFT_VERSION: '5.6.3'
134+
# windowsSwift57:
135+
# imageName: 'windows-2019'
136+
# SWIFT_VERSION: '5.7'
133137
pool:
134138
vmImage: $(imageName)
135139
variables:
@@ -160,7 +164,7 @@ stages:
160164
- job: ghPages
161165
displayName: 'Publish API docs to GH Pages'
162166
pool:
163-
vmImage: 'macOS-10.15'
167+
vmImage: 'macOS-11'
164168
variables:
165169
DEVELOPER_DIR: '/Applications/Xcode_12.4.app'
166170
steps:

0 commit comments

Comments
 (0)