Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Only basic features that almost all projects use, were added in this template:
* Unit tests and UI tests using Salad
* GitHub Actions CI configuration that runs the tests and submits the app to TestFlight

Xcode 16.0 or higher is required.
Xcode 26 or higher is required.

## Code style

Expand Down
12 changes: 10 additions & 2 deletions TemplateApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1510;
LastUpgradeCheck = 1600;
LastUpgradeCheck = 2600;
ORGANIZATIONNAME = Q42;
TargetAttributes = {
D5284F2B2B57C6B600BB32E7 = {
Expand Down Expand Up @@ -340,6 +340,7 @@
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 6.0;
Expand Down Expand Up @@ -398,6 +399,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 6.0;
VALIDATE_PRODUCT = YES;
Expand Down Expand Up @@ -430,7 +432,10 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.q42.TemplateApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_STRICT_CONCURRENCY = complete;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand Down Expand Up @@ -461,7 +466,10 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.q42.TemplateApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_STRICT_CONCURRENCY = complete;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down Expand Up @@ -577,7 +585,7 @@
repositoryURL = "https://github.com/hmlongco/Factory.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.3.2;
minimumVersion = 2.5.3;
};
};
D5F745F32BEE48BC0064F06A /* XCRemoteSwiftPackageReference "Salad" */ = {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1600"
LastUpgradeVersion = "2600"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion TemplateApp/Data/UserAgent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import UIKit
/// Returns the user agent string for this device, consisting of the app name, app version, build number, OS version and device model.
/// eg. MyApp/1.0 (1; iOS/18.3; iPhone13,2)
/// This format is consistent with the Android app template.
@MainActor func userAgentString() -> String {
func userAgentString() -> String {
let info = Bundle.main.infoDictionary
let appName = info?["CFBundleName"] as? String ?? "unknown"
let appVersion = info?["CFBundleShortVersionString"] as? String ?? "unknown"
Expand Down
2 changes: 1 addition & 1 deletion TemplateApp/Views/Home/HomeViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation

@Observable
@MainActor class HomeViewModel {
class HomeViewModel {
var state: HomeViewState = .empty

func refresh() async {
Expand Down