Skip to content

Commit fcfab21

Browse files
davdromandavdroman
authored
Bump Demo minimum deployment targets (#164)
1 parent be4fc84 commit fcfab21

File tree

14 files changed

+38
-166
lines changed

14 files changed

+38
-166
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Select Xcode version
4242
uses: mxcl/xcodebuild@v3
4343
with:
44-
swift: ${{ matrix.swift }}
44+
swift: ~${{ matrix.swift }}
4545
action: none
4646

4747
- name: List Runtimes

‎Examples/Demo/Demo.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@
99
/* Begin PBXBuildFile section */
1010
D52A95512DCEC08F00885069 /* SwiftUINavigationTransitions in Frameworks */ = {isa = PBXBuildFile; productRef = D52A95502DCEC08F00885069 /* SwiftUINavigationTransitions */; };
1111
D5535823290E9692009E5D72 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D5535822290E9692009E5D72 /* Assets.xcassets */; };
12-
D5535826290E9692009E5D72 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D5535825290E9692009E5D72 /* Preview Assets.xcassets */; };
1312
D5535834290E9718009E5D72 /* Swing.swift in Sources */ = {isa = PBXBuildFile; fileRef = D553582C290E9718009E5D72 /* Swing.swift */; };
1413
D5535835290E9718009E5D72 /* RootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D553582D290E9718009E5D72 /* RootView.swift */; };
15-
D5535836290E9718009E5D72 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D553582E290E9718009E5D72 /* SceneDelegate.swift */; };
16-
D5535837290E9718009E5D72 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D553582F290E9718009E5D72 /* LaunchScreen.storyboard */; platformFilter = ios; };
17-
D5535839290E9718009E5D72 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5535831290E9718009E5D72 /* AppDelegate.swift */; };
14+
D5535839290E9718009E5D72 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5535831290E9718009E5D72 /* App.swift */; };
1815
D5535843290F4BEA009E5D72 /* AppView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5535842290F4BEA009E5D72 /* AppView.swift */; };
1916
D5535845290F52F7009E5D72 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5535844290F52F7009E5D72 /* SettingsView.swift */; };
2017
D5535847290F5E6F009E5D72 /* AppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5535846290F5E6F009E5D72 /* AppState.swift */; };
@@ -27,17 +24,12 @@
2724
/* Begin PBXFileReference section */
2825
D553581B290E9691009E5D72 /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
2926
D5535822290E9692009E5D72 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
30-
D5535825290E9692009E5D72 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
3127
D553582C290E9718009E5D72 /* Swing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Swing.swift; sourceTree = "<group>"; };
3228
D553582D290E9718009E5D72 /* RootView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RootView.swift; sourceTree = "<group>"; };
33-
D553582E290E9718009E5D72 /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
34-
D553582F290E9718009E5D72 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
35-
D5535831290E9718009E5D72 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
36-
D553583C290E978C009E5D72 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
29+
D5535831290E9718009E5D72 /* App.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = "<group>"; };
3730
D5535842290F4BEA009E5D72 /* AppView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppView.swift; sourceTree = "<group>"; };
3831
D5535844290F52F7009E5D72 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
3932
D5535846290F5E6F009E5D72 /* AppState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppState.swift; sourceTree = "<group>"; };
40-
D571826B291C9426003672F5 /* Demo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Demo.entitlements; sourceTree = "<group>"; };
4133
D5755A78291ADC00007F2201 /* Zoom.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Zoom.swift; sourceTree = "<group>"; };
4234
D58D803E292176D200D9FEAE /* Flip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Flip.swift; sourceTree = "<group>"; };
4335
D5AAF4042911C59E009743D3 /* PageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageView.swift; sourceTree = "<group>"; };
@@ -76,11 +68,7 @@
7668
D553581D290E9691009E5D72 /* Demo */ = {
7769
isa = PBXGroup;
7870
children = (
79-
D571826B291C9426003672F5 /* Demo.entitlements */,
80-
D553583C290E978C009E5D72 /* Info.plist */,
81-
D553582F290E9718009E5D72 /* LaunchScreen.storyboard */,
82-
D5535831290E9718009E5D72 /* AppDelegate.swift */,
83-
D553582E290E9718009E5D72 /* SceneDelegate.swift */,
71+
D5535831290E9718009E5D72 /* App.swift */,
8472
D5535842290F4BEA009E5D72 /* AppView.swift */,
8573
D5535846290F5E6F009E5D72 /* AppState.swift */,
8674
D553582D290E9718009E5D72 /* RootView.swift */,
@@ -89,19 +77,10 @@
8977
D5535844290F52F7009E5D72 /* SettingsView.swift */,
9078
D58D8040292176EE00D9FEAE /* Custom Transitions */,
9179
D5535822290E9692009E5D72 /* Assets.xcassets */,
92-
D5535824290E9692009E5D72 /* Preview Content */,
9380
);
9481
path = Demo;
9582
sourceTree = "<group>";
9683
};
97-
D5535824290E9692009E5D72 /* Preview Content */ = {
98-
isa = PBXGroup;
99-
children = (
100-
D5535825290E9692009E5D72 /* Preview Assets.xcassets */,
101-
);
102-
path = "Preview Content";
103-
sourceTree = "<group>";
104-
};
10584
D553583D290E97C5009E5D72 /* Frameworks */ = {
10685
isa = PBXGroup;
10786
children = (
@@ -150,7 +129,7 @@
150129
attributes = {
151130
BuildIndependentTargetsInParallel = 1;
152131
LastSwiftUpdateCheck = 1410;
153-
LastUpgradeCheck = 1640;
132+
LastUpgradeCheck = 2600;
154133
TargetAttributes = {
155134
D553581A290E9691009E5D72 = {
156135
CreatedOnToolsVersion = 14.1;
@@ -183,8 +162,6 @@
183162
isa = PBXResourcesBuildPhase;
184163
buildActionMask = 2147483647;
185164
files = (
186-
D5535837290E9718009E5D72 /* LaunchScreen.storyboard in Resources */,
187-
D5535826290E9692009E5D72 /* Preview Assets.xcassets in Resources */,
188165
D5535823290E9692009E5D72 /* Assets.xcassets in Resources */,
189166
);
190167
runOnlyForDeploymentPostprocessing = 0;
@@ -201,12 +178,11 @@
201178
D5755A79291ADC00007F2201 /* Zoom.swift in Sources */,
202179
D58D803F292176D200D9FEAE /* Flip.swift in Sources */,
203180
D5AAF4052911C59E009743D3 /* PageView.swift in Sources */,
204-
D5535839290E9718009E5D72 /* AppDelegate.swift in Sources */,
181+
D5535839290E9718009E5D72 /* App.swift in Sources */,
205182
D5535847290F5E6F009E5D72 /* AppState.swift in Sources */,
206183
D5535843290F4BEA009E5D72 /* AppView.swift in Sources */,
207184
D5535835290E9718009E5D72 /* RootView.swift in Sources */,
208185
D5535834290E9718009E5D72 /* Swing.swift in Sources */,
209-
D5535836290E9718009E5D72 /* SceneDelegate.swift in Sources */,
210186
);
211187
runOnlyForDeploymentPostprocessing = 0;
212188
};
@@ -266,14 +242,18 @@
266242
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
267243
GCC_WARN_UNUSED_FUNCTION = YES;
268244
GCC_WARN_UNUSED_VARIABLE = YES;
269-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
245+
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
246+
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
247+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
270248
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
271249
MTL_FAST_MATH = YES;
272250
ONLY_ACTIVE_ARCH = YES;
273251
SDKROOT = iphoneos;
252+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
274253
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
275254
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
276-
TVOS_DEPLOYMENT_TARGET = 13.0;
255+
TVOS_DEPLOYMENT_TARGET = 15.0;
256+
XROS_DEPLOYMENT_TARGET = 1.0;
277257
};
278258
name = Debug;
279259
};
@@ -324,14 +304,18 @@
324304
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
325305
GCC_WARN_UNUSED_FUNCTION = YES;
326306
GCC_WARN_UNUSED_VARIABLE = YES;
327-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
307+
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
308+
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
309+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
328310
MTL_ENABLE_DEBUG_INFO = NO;
329311
MTL_FAST_MATH = YES;
330312
SDKROOT = iphoneos;
313+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
331314
SWIFT_COMPILATION_MODE = wholemodule;
332315
SWIFT_OPTIMIZATION_LEVEL = "-O";
333-
TVOS_DEPLOYMENT_TARGET = 13.0;
316+
TVOS_DEPLOYMENT_TARGET = 15.0;
334317
VALIDATE_PRODUCT = YES;
318+
XROS_DEPLOYMENT_TARGET = 1.0;
335319
};
336320
name = Release;
337321
};
@@ -341,16 +325,13 @@
341325
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
342326
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
343327
CLANG_ENABLE_MODULES = YES;
344-
CODE_SIGN_ENTITLEMENTS = Demo/Demo.entitlements;
345328
CODE_SIGN_STYLE = Automatic;
346329
CURRENT_PROJECT_VERSION = 1;
347-
DEVELOPMENT_ASSET_PATHS = "\"Demo/Preview Content\"";
330+
ENABLE_APP_SANDBOX = YES;
331+
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
348332
ENABLE_PREVIEWS = YES;
349333
GENERATE_INFOPLIST_FILE = YES;
350-
INFOPLIST_FILE = Demo/Info.plist;
351334
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
352-
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
353-
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
354335
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
355336
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
356337
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
@@ -378,16 +359,13 @@
378359
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
379360
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
380361
CLANG_ENABLE_MODULES = YES;
381-
CODE_SIGN_ENTITLEMENTS = Demo/Demo.entitlements;
382362
CODE_SIGN_STYLE = Automatic;
383363
CURRENT_PROJECT_VERSION = 1;
384-
DEVELOPMENT_ASSET_PATHS = "\"Demo/Preview Content\"";
364+
ENABLE_APP_SANDBOX = YES;
365+
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
385366
ENABLE_PREVIEWS = YES;
386367
GENERATE_INFOPLIST_FILE = YES;
387-
INFOPLIST_FILE = Demo/Info.plist;
388368
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
389-
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
390-
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
391369
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
392370
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
393371
INFOPLIST_KEY_UIUserInterfaceStyle = Light;

‎Examples/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.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 = "1640"
3+
LastUpgradeVersion = "2600"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Examples/Demo/Demo/AppDelegate.swift‎ renamed to ‎Examples/Demo/Demo/App.swift‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import SwiftUI
22

33
@main
4-
final class AppDelegate: UIResponder, UIApplicationDelegate {
4+
struct App: SwiftUI.App {
55
#if !os(tvOS)
6-
func applicationDidFinishLaunching(_ application: UIApplication) {
6+
init() {
77
customizeNavigationBarAppearance()
88
customizeTabBarAppearance()
99
}
@@ -19,9 +19,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
1919
proxy.scrollEdgeAppearance = customAppearance
2020
proxy.compactAppearance = customAppearance
2121
proxy.standardAppearance = customAppearance
22-
if #available(iOS 15.0, tvOS 15, *) {
23-
proxy.compactScrollEdgeAppearance = customAppearance
24-
}
22+
proxy.compactScrollEdgeAppearance = customAppearance
2523
}
2624

2725
func customizeTabBarAppearance() {
@@ -32,13 +30,13 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
3230

3331
let proxy = UITabBar.appearance()
3432
proxy.standardAppearance = customAppearance
35-
if #available(iOS 15, tvOS 15, *) {
36-
proxy.scrollEdgeAppearance = customAppearance
37-
}
33+
proxy.scrollEdgeAppearance = customAppearance
3834
}
3935
#endif
4036

41-
func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
42-
UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
37+
var body: some Scene {
38+
WindowGroup {
39+
AppView()
40+
}
4341
}
4442
}

‎Examples/Demo/Demo/AppView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import SwiftUI
22

33
struct AppView: View {
4-
@ObservedObject var appState = AppState()
4+
@StateObject var appState = AppState()
55

66
var body: some View {
77
RootView().environmentObject(appState)

‎Examples/Demo/Demo/Demo.entitlements‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Examples/Demo/Demo/Info.plist‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎Examples/Demo/Demo/LaunchScreen.storyboard‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎Examples/Demo/Demo/PageView.swift‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,7 @@ struct PageView<Content: View, Link: View, Destination: View>: View {
5959
#endif
6060
.navigationBarItems(
6161
trailing: Button(action: { appState.isPresentingSettings = true }) {
62-
Group {
63-
if #available(iOS 14, tvOS 16, *) {
64-
Image(systemName: "gearshape")
65-
} else {
66-
Image(systemName: "gear")
67-
}
68-
}
69-
.font(.system(size: 16, weight: .semibold))
62+
Image(systemName: "gearshape").font(.system(size: 16, weight: .semibold))
7063
}
7164
)
7265
}

‎Examples/Demo/Demo/Pages.swift‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,8 @@ struct Code<Content: StringProtocol>: View {
164164
.font(.system(size: 14, design: .monospaced))
165165
.background(shape.stroke(Color(white: 0.1).opacity(0.35), lineWidth: 1))
166166
.background(Color(white: 0.94).opacity(0.6).clipShape(shape))
167-
#if !os(tvOS)
168-
.modifier {
169-
if #available(iOS 15, *) {
170-
$0.textSelection(.enabled)
171-
} else {
172-
$0
173-
}
174-
}
175-
#endif
167+
#if !os(tvOS)
168+
.textSelection(.enabled)
169+
#endif
176170
}
177171
}

0 commit comments

Comments
 (0)