Skip to content

Commit 962f056

Browse files
pahillpahill
authored
Upgraded dependencies (#70)
* Upgraded dependencies Moved Android to v33 Moved iOS to v14.0 Moved app code from UIKit to fully SwiftUI
1 parent 30dbf7d commit 962f056

File tree

15 files changed

+64
-194
lines changed

15 files changed

+64
-194
lines changed

‎androidApp/build.gradle.kts

+13-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44
}
55

66
android {
7-
compileSdk = 31
7+
compileSdk = 33
88
defaultConfig {
99
applicationId = "com.jetbrains.androidApp"
1010
minSdk = 21
11-
targetSdk = 31
11+
targetSdk = 33
1212
versionCode = 1
1313
versionName = "1.0"
1414
}
@@ -17,11 +17,19 @@ android {
1717
isMinifyEnabled = false
1818
}
1919
}
20+
compileOptions {
21+
sourceCompatibility = JavaVersion.VERSION_1_8
22+
targetCompatibility = JavaVersion.VERSION_1_8
23+
}
24+
kotlinOptions {
25+
jvmTarget = "1.8"
26+
}
27+
namespace = "com.jetbrains.androidApp"
2028
}
2129

2230
dependencies {
2331
implementation(project(":shared"))
24-
implementation("com.google.android.material:material:1.4.0")
25-
implementation("androidx.appcompat:appcompat:1.3.1")
26-
implementation("androidx.constraintlayout:constraintlayout:2.1.0")
32+
implementation("com.google.android.material:material:1.9.0")
33+
implementation("androidx.appcompat:appcompat:1.6.1")
34+
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
2735
}

‎androidApp/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.jetbrains.androidApp">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="false"

‎build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
buildscript {
1+
buildscript {
22
repositories {
33
gradlePluginPortal()
44
google()
55
mavenCentral()
66
}
77
dependencies {
8-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
9-
classpath("com.android.tools.build:gradle:7.0.4")
8+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
9+
classpath("com.android.tools.build:gradle:8.0.2")
1010
}
1111
}
1212

‎gradle.properties

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ kotlin.code.style=official
88
android.useAndroidX=true
99

1010
#MPP
11-
kotlin.mpp.enableGranularSourceSetsMetadata=true
12-
kotlin.native.enableDependencyPropagation=false
13-
kotlin.mpp.enableCInteropCommonization=true
11+
kotlin.mpp.androidSourceSetLayoutVersion=2
12+
kotlin.mpp.enableCInteropCommonization=true

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip

‎iosApp/iosApp.xcodeproj/project.pbxproj

+15-29
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 53;
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
7555FF7F242A565900829871 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF7E242A565900829871 /* AppDelegate.swift */; };
11-
7555FF81242A565900829871 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF80242A565900829871 /* SceneDelegate.swift */; };
10+
66CD08CE2A407C2900D66EFD /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66CD08CD2A407C2900D66EFD /* iOSApp.swift */; };
1211
7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
1312
7555FF85242A565B00829871 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7555FF84242A565B00829871 /* Assets.xcassets */; };
1413
7555FF88242A565B00829871 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7555FF87242A565B00829871 /* Preview Assets.xcassets */; };
15-
7555FF8B242A565B00829871 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7555FF89242A565B00829871 /* LaunchScreen.storyboard */; };
1614
7555FF96242A565B00829871 /* iosAppTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF95242A565B00829871 /* iosAppTests.swift */; };
1715
7555FFA1242A565B00829871 /* iosAppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FFA0242A565B00829871 /* iosAppUITests.swift */; };
1816
/* End PBXBuildFile section */
@@ -35,13 +33,11 @@
3533
/* End PBXContainerItemProxy section */
3634

3735
/* Begin PBXFileReference section */
36+
66CD08CD2A407C2900D66EFD /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
3837
7555FF7B242A565900829871 /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
39-
7555FF7E242A565900829871 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
40-
7555FF80242A565900829871 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
4138
7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
4239
7555FF84242A565B00829871 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4340
7555FF87242A565B00829871 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
44-
7555FF8A242A565B00829871 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4541
7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4642
7555FF91242A565B00829871 /* iosAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iosAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4743
7555FF95242A565B00829871 /* iosAppTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosAppTests.swift; sourceTree = "<group>"; };
@@ -100,13 +96,11 @@
10096
7555FF7D242A565900829871 /* iosApp */ = {
10197
isa = PBXGroup;
10298
children = (
103-
7555FF7E242A565900829871 /* AppDelegate.swift */,
104-
7555FF80242A565900829871 /* SceneDelegate.swift */,
10599
7555FF82242A565900829871 /* ContentView.swift */,
106100
7555FF84242A565B00829871 /* Assets.xcassets */,
107-
7555FF89242A565B00829871 /* LaunchScreen.storyboard */,
108101
7555FF8C242A565B00829871 /* Info.plist */,
109102
7555FF86242A565B00829871 /* Preview Content */,
103+
66CD08CD2A407C2900D66EFD /* iOSApp.swift */,
110104
);
111105
path = iosApp;
112106
sourceTree = "<group>";
@@ -207,8 +201,9 @@
207201
7555FF73242A565900829871 /* Project object */ = {
208202
isa = PBXProject;
209203
attributes = {
204+
BuildIndependentTargetsInParallel = YES;
210205
LastSwiftUpdateCheck = 1130;
211-
LastUpgradeCheck = 1130;
206+
LastUpgradeCheck = 1430;
212207
ORGANIZATIONNAME = orgName;
213208
TargetAttributes = {
214209
7555FF7A242A565900829871 = {
@@ -249,7 +244,6 @@
249244
isa = PBXResourcesBuildPhase;
250245
buildActionMask = 2147483647;
251246
files = (
252-
7555FF8B242A565B00829871 /* LaunchScreen.storyboard in Resources */,
253247
7555FF88242A565B00829871 /* Preview Assets.xcassets in Resources */,
254248
7555FF85242A565B00829871 /* Assets.xcassets in Resources */,
255249
);
@@ -297,9 +291,8 @@
297291
isa = PBXSourcesBuildPhase;
298292
buildActionMask = 2147483647;
299293
files = (
300-
7555FF7F242A565900829871 /* AppDelegate.swift in Sources */,
301-
7555FF81242A565900829871 /* SceneDelegate.swift in Sources */,
302294
7555FF83242A565900829871 /* ContentView.swift in Sources */,
295+
66CD08CE2A407C2900D66EFD /* iOSApp.swift in Sources */,
303296
);
304297
runOnlyForDeploymentPostprocessing = 0;
305298
};
@@ -334,17 +327,6 @@
334327
};
335328
/* End PBXTargetDependency section */
336329

337-
/* Begin PBXVariantGroup section */
338-
7555FF89242A565B00829871 /* LaunchScreen.storyboard */ = {
339-
isa = PBXVariantGroup;
340-
children = (
341-
7555FF8A242A565B00829871 /* Base */,
342-
);
343-
name = LaunchScreen.storyboard;
344-
sourceTree = "<group>";
345-
};
346-
/* End PBXVariantGroup section */
347-
348330
/* Begin XCBuildConfiguration section */
349331
7555FFA3242A565B00829871 /* Debug */ = {
350332
isa = XCBuildConfiguration;
@@ -372,6 +354,7 @@
372354
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
373355
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
374356
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
357+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
375358
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
376359
CLANG_WARN_STRICT_PROTOTYPES = YES;
377360
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -396,7 +379,7 @@
396379
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
397380
GCC_WARN_UNUSED_FUNCTION = YES;
398381
GCC_WARN_UNUSED_VARIABLE = YES;
399-
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
382+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
400383
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
401384
MTL_FAST_MATH = YES;
402385
ONLY_ACTIVE_ARCH = YES;
@@ -432,6 +415,7 @@
432415
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
433416
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
434417
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
418+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
435419
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
436420
CLANG_WARN_STRICT_PROTOTYPES = YES;
437421
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -450,7 +434,7 @@
450434
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
451435
GCC_WARN_UNUSED_FUNCTION = YES;
452436
GCC_WARN_UNUSED_VARIABLE = YES;
453-
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
437+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
454438
MTL_ENABLE_DEBUG_INFO = NO;
455439
MTL_FAST_MATH = YES;
456440
SDKROOT = iphoneos;
@@ -469,6 +453,7 @@
469453
ENABLE_PREVIEWS = YES;
470454
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
471455
INFOPLIST_FILE = iosApp/Info.plist;
456+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
472457
LD_RUNPATH_SEARCH_PATHS = (
473458
"$(inherited)",
474459
"@executable_path/Frameworks",
@@ -494,6 +479,7 @@
494479
ENABLE_PREVIEWS = YES;
495480
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
496481
INFOPLIST_FILE = iosApp/Info.plist;
482+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
497483
LD_RUNPATH_SEARCH_PATHS = (
498484
"$(inherited)",
499485
"@executable_path/Frameworks",
@@ -517,7 +503,7 @@
517503
BUNDLE_LOADER = "$(TEST_HOST)";
518504
CODE_SIGN_STYLE = Automatic;
519505
INFOPLIST_FILE = iosAppTests/Info.plist;
520-
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
506+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
521507
LD_RUNPATH_SEARCH_PATHS = (
522508
"$(inherited)",
523509
"@executable_path/Frameworks",
@@ -538,7 +524,7 @@
538524
BUNDLE_LOADER = "$(TEST_HOST)";
539525
CODE_SIGN_STYLE = Automatic;
540526
INFOPLIST_FILE = iosAppTests/Info.plist;
541-
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
527+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
542528
LD_RUNPATH_SEARCH_PATHS = (
543529
"$(inherited)",
544530
"@executable_path/Frameworks",

‎iosApp/iosApp/AppDelegate.swift

-29
This file was deleted.

‎iosApp/iosApp/Base.lproj/LaunchScreen.storyboard

-25
This file was deleted.

‎iosApp/iosApp/Info.plist

-14
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,7 @@
2424
<dict>
2525
<key>UIApplicationSupportsMultipleScenes</key>
2626
<false/>
27-
<key>UISceneConfigurations</key>
28-
<dict>
29-
<key>UIWindowSceneSessionRoleApplication</key>
30-
<array>
31-
<dict>
32-
<key>UISceneConfigurationName</key>
33-
<string>Default Configuration</string>
34-
<key>UISceneDelegateClassName</key>
35-
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
36-
</dict>
37-
</array>
38-
</dict>
3927
</dict>
40-
<key>UILaunchStoryboardName</key>
41-
<string>LaunchScreen</string>
4228
<key>UIRequiredDeviceCapabilities</key>
4329
<array>
4430
<string>armv7</string>

‎iosApp/iosApp/SceneDelegate.swift

-56
This file was deleted.

‎iosApp/iosApp/iOSApp.swift

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import SwiftUI
2+
3+
@main
4+
struct SampleApp: App {
5+
var body: some Scene {
6+
WindowGroup {
7+
ContentView()
8+
}
9+
}
10+
}

0 commit comments

Comments
 (0)