Skip to content

Commit 90d5019

Browse files
committed
Xcode and CI updates: update to xcode 14, enable dead code stripping and eager linking in xcode project, increase minimum deployment targets for darwing platforms, add swift 5.7 to CI, update swift 5.6 to 5.6.3 in CI
1 parent 60f05c0 commit 90d5019

4 files changed

Lines changed: 30 additions & 13 deletions

File tree

BitByteData.xcodeproj/project.pbxproj

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
attributes = {
247247
DefaultBuildSystemTypeForWorkspace = Latest;
248248
LastSwiftUpdateCheck = 1000;
249-
LastUpgradeCheck = 1340;
249+
LastUpgradeCheck = 1400;
250250
ORGANIZATIONNAME = "Timofey Solomko";
251251
TargetAttributes = {
252252
065DD5DE21673BC100704028 = {
@@ -407,7 +407,9 @@
407407
CLANG_WARN_UNREACHABLE_CODE = YES;
408408
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
409409
CURRENT_PROJECT_VERSION = 27;
410+
DEAD_CODE_STRIPPING = YES;
410411
DEBUG_INFORMATION_FORMAT = dwarf;
412+
EAGER_LINKING = YES;
411413
ENABLE_STRICT_OBJC_MSGSEND = YES;
412414
ENABLE_TESTABILITY = YES;
413415
GCC_NO_COMMON_BLOCKS = YES;
@@ -418,17 +420,17 @@
418420
GCC_WARN_UNINITIALIZED_AUTOS = YES;
419421
GCC_WARN_UNUSED_FUNCTION = YES;
420422
GCC_WARN_UNUSED_VARIABLE = YES;
421-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
422-
MACOSX_DEPLOYMENT_TARGET = 10.10;
423+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
424+
MACOSX_DEPLOYMENT_TARGET = 10.13;
423425
ONLY_ACTIVE_ARCH = YES;
424426
OTHER_CODE_SIGN_FLAGS = "--deep";
425427
SDKROOT = macosx;
426428
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos";
427429
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
428430
SWIFT_VERSION = 5.0;
429-
TVOS_DEPLOYMENT_TARGET = 9.0;
431+
TVOS_DEPLOYMENT_TARGET = 11.0;
430432
VERSIONING_SYSTEM = "apple-generic";
431-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
433+
WATCHOS_DEPLOYMENT_TARGET = 4.0;
432434
};
433435
name = Debug;
434436
};
@@ -456,7 +458,9 @@
456458
CLANG_WARN_UNREACHABLE_CODE = YES;
457459
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
458460
CURRENT_PROJECT_VERSION = 27;
461+
DEAD_CODE_STRIPPING = YES;
459462
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
463+
EAGER_LINKING = YES;
460464
ENABLE_STRICT_OBJC_MSGSEND = YES;
461465
GCC_NO_COMMON_BLOCKS = YES;
462466
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -465,16 +469,16 @@
465469
GCC_WARN_UNINITIALIZED_AUTOS = YES;
466470
GCC_WARN_UNUSED_FUNCTION = YES;
467471
GCC_WARN_UNUSED_VARIABLE = YES;
468-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
469-
MACOSX_DEPLOYMENT_TARGET = 10.10;
472+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
473+
MACOSX_DEPLOYMENT_TARGET = 10.13;
470474
OTHER_CODE_SIGN_FLAGS = "--deep";
471475
SDKROOT = macosx;
472476
SUPPORTED_PLATFORMS = "macosx watchsimulator iphonesimulator appletvsimulator watchos appletvos iphoneos";
473477
SWIFT_COMPILATION_MODE = wholemodule;
474478
SWIFT_VERSION = 5.0;
475-
TVOS_DEPLOYMENT_TARGET = 9.0;
479+
TVOS_DEPLOYMENT_TARGET = 11.0;
476480
VERSIONING_SYSTEM = "apple-generic";
477-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
481+
WATCHOS_DEPLOYMENT_TARGET = 4.0;
478482
};
479483
name = Release;
480484
};

BitByteData.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
<dict>
55
<key>BuildSystemType</key>
66
<string>Latest</string>
7+
<key>PreviewsEnabled</key>
8+
<false/>
79
</dict>
810
</plist>

BitByteData.xcodeproj/xcshareddata/xcschemes/BitByteData.xcscheme

Lines changed: 1 addition & 1 deletion
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.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

azure-pipelines.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@ stages:
4242
WATCHOS_SIMULATOR: 'Apple Watch Series 6 - 44mm'
4343
macosSwift56:
4444
imageName: 'macOS-12'
45-
DEVELOPER_DIR: '/Applications/Xcode_13.4.app'
45+
DEVELOPER_DIR: '/Applications/Xcode_13.4.1.app'
46+
WATCHOS_ACTIONS: 'clean test'
47+
WATCHOS_SIMULATOR: 'Apple Watch Series 6 - 44mm'
48+
macosSwift57:
49+
imageName: 'macOS-12'
50+
DEVELOPER_DIR: '/Applications/Xcode_14.0.app'
4651
WATCHOS_ACTIONS: 'clean test'
4752
WATCHOS_SIMULATOR: 'Apple Watch Series 6 - 44mm'
4853
pool:
@@ -87,7 +92,10 @@ stages:
8792
containerImage: 'swift:5.5.3-bionic'
8893
linuxSwift56:
8994
imageName: 'ubuntu-18.04'
90-
containerImage: 'swift:5.6.1-bionic'
95+
containerImage: 'swift:5.6.3-bionic'
96+
linuxSwift57:
97+
imageName: 'ubuntu-18.04'
98+
containerImage: 'swift:5.7-bionic'
9199
pool:
92100
vmImage: $(imageName)
93101
container: $[ variables['containerImage'] ]
@@ -114,7 +122,10 @@ stages:
114122
SWIFT_VERSION: '5.5.3'
115123
# windowsSwift56:
116124
# imageName: 'windows-2019'
117-
# SWIFT_VERSION: '5.6.1'
125+
# SWIFT_VERSION: '5.6.3'
126+
# windowsSwift57:
127+
# imageName: 'windows-2019'
128+
# SWIFT_VERSION: '5.7'
118129
pool:
119130
vmImage: $(imageName)
120131
variables:

0 commit comments

Comments
 (0)