Skip to content

Commit 5bcd1ca

Browse files
authored
Merge pull request #27 from Q42/ios-26-and-xcode-26
Update project settings for Xcode 26
2 parents 5b6fddf + 4c17bea commit 5bcd1ca

File tree

6 files changed

+16
-8
lines changed

6 files changed

+16
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Only basic features that almost all projects use, were added in this template:
1919
* Unit tests and UI tests using Salad
2020
* GitHub Actions CI configuration that runs the tests and submits the app to TestFlight
2121

22-
Xcode 16.0 or higher is required.
22+
Xcode 26 or higher is required.
2323

2424
## Code style
2525

TemplateApp.xcodeproj/project.pbxproj

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
attributes = {
191191
BuildIndependentTargetsInParallel = 1;
192192
LastSwiftUpdateCheck = 1510;
193-
LastUpgradeCheck = 1600;
193+
LastUpgradeCheck = 2600;
194194
ORGANIZATIONNAME = Q42;
195195
TargetAttributes = {
196196
D5284F2B2B57C6B600BB32E7 = {
@@ -340,6 +340,7 @@
340340
MTL_FAST_MATH = YES;
341341
ONLY_ACTIVE_ARCH = YES;
342342
SDKROOT = iphoneos;
343+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
343344
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
344345
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
345346
SWIFT_VERSION = 6.0;
@@ -398,6 +399,7 @@
398399
MTL_ENABLE_DEBUG_INFO = NO;
399400
MTL_FAST_MATH = YES;
400401
SDKROOT = iphoneos;
402+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
401403
SWIFT_COMPILATION_MODE = wholemodule;
402404
SWIFT_VERSION = 6.0;
403405
VALIDATE_PRODUCT = YES;
@@ -430,7 +432,10 @@
430432
MARKETING_VERSION = 1.0;
431433
PRODUCT_BUNDLE_IDENTIFIER = com.q42.TemplateApp;
432434
PRODUCT_NAME = "$(TARGET_NAME)";
435+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
436+
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
433437
SWIFT_EMIT_LOC_STRINGS = YES;
438+
SWIFT_STRICT_CONCURRENCY = complete;
434439
TARGETED_DEVICE_FAMILY = "1,2";
435440
};
436441
name = Debug;
@@ -461,7 +466,10 @@
461466
MARKETING_VERSION = 1.0;
462467
PRODUCT_BUNDLE_IDENTIFIER = com.q42.TemplateApp;
463468
PRODUCT_NAME = "$(TARGET_NAME)";
469+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
470+
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
464471
SWIFT_EMIT_LOC_STRINGS = YES;
472+
SWIFT_STRICT_CONCURRENCY = complete;
465473
TARGETED_DEVICE_FAMILY = "1,2";
466474
};
467475
name = Release;
@@ -577,7 +585,7 @@
577585
repositoryURL = "https://github.com/hmlongco/Factory.git";
578586
requirement = {
579587
kind = upToNextMajorVersion;
580-
minimumVersion = 2.3.2;
588+
minimumVersion = 2.5.3;
581589
};
582590
};
583591
D5F745F32BEE48BC0064F06A /* XCRemoteSwiftPackageReference "Salad" */ = {

TemplateApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

TemplateApp.xcodeproj/xcshareddata/xcschemes/TemplateApp.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 = "1600"
3+
LastUpgradeVersion = "2600"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

TemplateApp/Data/UserAgent.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import UIKit
1212
/// Returns the user agent string for this device, consisting of the app name, app version, build number, OS version and device model.
1313
/// eg. MyApp/1.0 (1; iOS/18.3; iPhone13,2)
1414
/// This format is consistent with the Android app template.
15-
@MainActor func userAgentString() -> String {
15+
func userAgentString() -> String {
1616
let info = Bundle.main.infoDictionary
1717
let appName = info?["CFBundleName"] as? String ?? "unknown"
1818
let appVersion = info?["CFBundleShortVersionString"] as? String ?? "unknown"

TemplateApp/Views/Home/HomeViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import Foundation
99

1010
@Observable
11-
@MainActor class HomeViewModel {
11+
class HomeViewModel {
1212
var state: HomeViewState = .empty
1313

1414
func refresh() async {

0 commit comments

Comments
 (0)