Skip to content

Commit ce94813

Browse files
jessesquiresjessesquires
authored
Fixes and updates for Xcode 16 + Swift 6.0 (#106)
1 parent 2645871 commit ce94813

File tree

10 files changed

+35
-37
lines changed

10 files changed

+35
-37
lines changed

‎.github/workflows/ci.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ env:
2020
EXAMPLE_PROJECT: Example/ExampleApp.xcodeproj
2121
EXAMPLE_SCHEME: ExampleApp
2222

23-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
23+
DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
2424

25-
IOS_DEST: "platform=iOS Simulator,name=iPhone 15,OS=latest"
25+
IOS_DEST: "platform=iOS Simulator,name=iPhone 16,OS=latest"
2626
TVOS_DEST: "platform=tvOS Simulator,name=Apple TV,OS=latest"
27-
WATCHOS_DEST: "platform=watchOS Simulator,name=Apple Watch Series 9 (41mm),OS=latest"
27+
WATCHOS_DEST: "platform=watchOS Simulator,name=Apple Watch Series 10 (42mm),OS=latest"
2828
VISIONOS_DEST: "platform=visionOS Simulator,name=Apple Vision Pro,OS=latest"
2929
MACOS_DEST: "platform=macOS,arch=x86_64"
3030

3131
jobs:
3232
env-details:
3333
name: Environment details
34-
runs-on: macos-14
34+
runs-on: macos-15
3535
steps:
3636
- name: xcode version
3737
run: xcodebuild -version -sdk
@@ -43,7 +43,7 @@ jobs:
4343
4444
test-iOS:
4545
name: iOS unit test
46-
runs-on: macos-14
46+
runs-on: macos-15
4747
steps:
4848
- name: git checkout
4949
uses: actions/checkout@v4
@@ -59,7 +59,7 @@ jobs:
5959
6060
test-tvOS:
6161
name: tvOS unit test
62-
runs-on: macos-14
62+
runs-on: macos-15
6363
steps:
6464
- name: git checkout
6565
uses: actions/checkout@v4
@@ -75,7 +75,7 @@ jobs:
7575
7676
test-watchOS:
7777
name: watchOS unit test
78-
runs-on: macos-14
78+
runs-on: macos-15
7979
steps:
8080
- name: git checkout
8181
uses: actions/checkout@v4
@@ -91,7 +91,7 @@ jobs:
9191
9292
test-visionOS:
9393
name: visionOS unit test
94-
runs-on: macos-14
94+
runs-on: macos-15
9595
steps:
9696
- name: git checkout
9797
uses: actions/checkout@v4
@@ -107,7 +107,7 @@ jobs:
107107
108108
test-macOS:
109109
name: macOS unit test
110-
runs-on: macos-14
110+
runs-on: macos-15
111111
steps:
112112
- name: git checkout
113113
uses: actions/checkout@v4
@@ -123,7 +123,7 @@ jobs:
123123
124124
build-example:
125125
name: build example project
126-
runs-on: macos-14
126+
runs-on: macos-15
127127
steps:
128128
- name: git checkout
129129
uses: actions/checkout@v4

‎.github/workflows/danger.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
types: [synchronize, opened, reopened, labeled, unlabeled, edited]
99

1010
env:
11-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
11+
DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
1212

1313
jobs:
1414
main:

‎.github/workflows/pod-lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- main
1313

1414
env:
15-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
15+
DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
1616

1717
jobs:
1818
main:

‎.github/workflows/spm-macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ on:
1212
- main
1313

1414
env:
15-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
15+
DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
1616

1717
jobs:
1818
main:
1919
name: SwiftPM Build
20-
runs-on: macos-14
20+
runs-on: macos-15
2121
steps:
2222
- name: git checkout
2323
uses: actions/checkout@v4

‎Example/ExampleApp.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
318318
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
319319
SWIFT_STRICT_CONCURRENCY = complete;
320-
SWIFT_VERSION = 5.0;
320+
SWIFT_VERSION = 6.0;
321321
};
322322
name = Debug;
323323
};
@@ -375,7 +375,7 @@
375375
SWIFT_COMPILATION_MODE = wholemodule;
376376
SWIFT_OPTIMIZATION_LEVEL = "-O";
377377
SWIFT_STRICT_CONCURRENCY = complete;
378-
SWIFT_VERSION = 5.0;
378+
SWIFT_VERSION = 6.0;
379379
VALIDATE_PRODUCT = YES;
380380
};
381381
name = Release;

‎Example/ExampleApp.xcodeproj/xcshareddata/xcschemes/ExampleApp.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 = "1540"
3+
LastUpgradeVersion = "1600"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Example/ExampleApp/Base.lproj/Main.storyboard

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="QOV-Zk-VuO">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23077.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="QOV-Zk-VuO">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23068.1"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="System colors in document resources" minToolsVersion="11.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -34,7 +34,7 @@
3434
<tabBarItem key="tabBarItem" title="Example" image="gear" catalog="system" id="Gtk-yk-EbZ"/>
3535
<simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
3636
<navigationBar key="navigationBar" contentMode="scaleToFill" id="UFY-h1-JS7">
37-
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
37+
<rect key="frame" x="0.0" y="48" width="414" height="44"/>
3838
<autoresizingMask key="autoresizingMask"/>
3939
</navigationBar>
4040
<toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="HDr-MP-Xcj">
@@ -58,7 +58,7 @@
5858
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
5959
<subviews>
6060
<stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="7IB-6X-UEM">
61-
<rect key="frame" x="16" y="435" width="382" height="31"/>
61+
<rect key="frame" x="16" y="437" width="382" height="31"/>
6262
<subviews>
6363
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kch-KK-B3T">
6464
<rect key="frame" x="0.0" y="0.0" width="325" height="31"/>
@@ -96,17 +96,17 @@
9696
<!--SwiftUI Example-->
9797
<scene sceneID="aYl-9w-e1l">
9898
<objects>
99-
<placeholder placeholderIdentifier="IBFirstResponder" id="6wg-hq-V21" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
10099
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="qeM-ea-Ji2" sceneMemberID="viewController">
101100
<tabBarItem key="tabBarItem" title="SwiftUI Example" image="sparkles" catalog="system" id="51J-9b-V70"/>
102101
<navigationBar key="navigationBar" contentMode="scaleToFill" id="PDi-2h-UFd">
103-
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
102+
<rect key="frame" x="0.0" y="48" width="414" height="44"/>
104103
<autoresizingMask key="autoresizingMask"/>
105104
</navigationBar>
106105
<connections>
107106
<segue destination="OgM-4o-cBL" kind="relationship" relationship="rootViewController" id="VIL-ja-D7w"/>
108107
</connections>
109108
</navigationController>
109+
<placeholder placeholderIdentifier="IBFirstResponder" id="6wg-hq-V21" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
110110
</objects>
111111
<point key="canvasLocation" x="1374" y="-660"/>
112112
</scene>
@@ -150,10 +150,10 @@
150150
<scene sceneID="CQo-QX-Tih">
151151
<objects>
152152
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="5zf-9Z-6TF" sceneMemberID="viewController">
153-
<tabBarItem key="tabBarItem" title="Combine Example" image="arrow.triangle.2.circlepath" catalog="system" id="cuf-gX-29c"/>
153+
<tabBarItem key="tabBarItem" title="Combine Example" image="arrow.trianglehead.2.clockwise.rotate.90" catalog="system" id="cuf-gX-29c"/>
154154
<toolbarItems/>
155155
<navigationBar key="navigationBar" contentMode="scaleToFill" id="anf-E0-vRG">
156-
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
156+
<rect key="frame" x="0.0" y="48" width="414" height="44"/>
157157
<autoresizingMask key="autoresizingMask"/>
158158
</navigationBar>
159159
<nil name="viewControllers"/>
@@ -167,9 +167,9 @@
167167
</scene>
168168
</scenes>
169169
<resources>
170-
<image name="arrow.triangle.2.circlepath" catalog="system" width="128" height="101"/>
171-
<image name="gear" catalog="system" width="128" height="119"/>
172-
<image name="sparkles" catalog="system" width="112" height="128"/>
170+
<image name="arrow.trianglehead.2.clockwise.rotate.90" catalog="system" width="128" height="117"/>
171+
<image name="gear" catalog="system" width="128" height="122"/>
172+
<image name="sparkles" catalog="system" width="115" height="128"/>
173173
<systemColor name="systemBackgroundColor">
174174
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
175175
</systemColor>

‎Foil.xcodeproj/project.pbxproj

+5-7
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
attributes = {
167167
BuildIndependentTargetsInParallel = YES;
168168
LastSwiftUpdateCheck = 1230;
169-
LastUpgradeCheck = 1540;
169+
LastUpgradeCheck = 1600;
170170
ORGANIZATIONNAME = "Hexed Bits";
171171
TargetAttributes = {
172172
0BF54A7F25BF589E008484F8 = {
@@ -338,7 +338,7 @@
338338
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
339339
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
340340
SWIFT_STRICT_CONCURRENCY = complete;
341-
SWIFT_VERSION = 5.0;
341+
SWIFT_VERSION = 6.0;
342342
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
343343
TVOS_DEPLOYMENT_TARGET = 13.0;
344344
VERSIONING_SYSTEM = "apple-generic";
@@ -407,7 +407,7 @@
407407
SWIFT_COMPILATION_MODE = wholemodule;
408408
SWIFT_OPTIMIZATION_LEVEL = "-O";
409409
SWIFT_STRICT_CONCURRENCY = complete;
410-
SWIFT_VERSION = 5.0;
410+
SWIFT_VERSION = 6.0;
411411
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
412412
TVOS_DEPLOYMENT_TARGET = 13.0;
413413
VALIDATE_PRODUCT = YES;
@@ -422,7 +422,7 @@
422422
isa = XCBuildConfiguration;
423423
buildSettings = {
424424
CLANG_ENABLE_MODULES = YES;
425-
CODE_SIGN_IDENTITY = "Apple Development";
425+
CODE_SIGN_IDENTITY = "";
426426
CODE_SIGN_STYLE = Automatic;
427427
DEFINES_MODULE = YES;
428428
DEVELOPMENT_TEAM = "";
@@ -455,7 +455,7 @@
455455
isa = XCBuildConfiguration;
456456
buildSettings = {
457457
CLANG_ENABLE_MODULES = YES;
458-
CODE_SIGN_IDENTITY = "Apple Development";
458+
CODE_SIGN_IDENTITY = "";
459459
CODE_SIGN_STYLE = Automatic;
460460
DEFINES_MODULE = YES;
461461
DEVELOPMENT_TEAM = "";
@@ -486,7 +486,6 @@
486486
0BF54A9825BF589E008484F8 /* Debug */ = {
487487
isa = XCBuildConfiguration;
488488
buildSettings = {
489-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
490489
CODE_SIGN_IDENTITY = "Apple Development";
491490
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
492491
CODE_SIGN_STYLE = Automatic;
@@ -508,7 +507,6 @@
508507
0BF54A9925BF589E008484F8 /* Release */ = {
509508
isa = XCBuildConfiguration;
510509
buildSettings = {
511-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
512510
CODE_SIGN_IDENTITY = "Apple Development";
513511
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
514512
CODE_SIGN_STYLE = Automatic;

‎Foil.xcodeproj/xcshareddata/xcschemes/Foil.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 = "1540"
3+
LastUpgradeVersion = "1600"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Tests/TestSettings.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct User: Hashable, Codable, UserDefaultsSerializable {
4343
final class TestSettings: NSObject, @unchecked Sendable {
4444
static let suiteName = UUID().uuidString
4545

46-
static let store = UserDefaults.testSuite(name: suiteName)
46+
nonisolated(unsafe) static let store = UserDefaults.testSuite(name: suiteName)
4747

4848
// swiftlint:disable:next type_contents_order
4949
static func reset() {

0 commit comments

Comments
 (0)