Skip to content

Commit 7af5ea0

Browse files
authored
Merge pull request #2 from terrakok/main
Update Kotlin to 1.9.20-Beta2
2 parents 2a35d3a + d40d70d commit 7af5ea0

File tree

2,121 files changed

+145
-37064
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,121 files changed

+145
-37064
lines changed

step2/.gitignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
*.iml
2+
.gradle
3+
.idea
4+
.DS_Store
5+
build
6+
*/build
7+
captures
8+
.externalNativeBuild
9+
.cxx
10+
local.properties
11+
xcuserdata/
12+
Pods/
13+
/androidApp/key
14+
*.jks
15+
*yarn.lock

step2/androidApp/build.gradle.kts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ plugins {
55

66
android {
77
namespace = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"
8-
compileSdk = 33
8+
compileSdk = 34
99
defaultConfig {
1010
applicationId = "com.jetbrains.simplelogin.kotlinmultiplatformsandbox"
11-
minSdk = 24
12-
targetSdk = 33
11+
minSdk = 26
12+
targetSdk = 34
1313
versionCode = 1
1414
versionName = "1.0"
1515
}
1616
buildFeatures {
1717
compose = true
1818
}
1919
composeOptions {
20-
kotlinCompilerExtensionVersion = "1.4.7"
20+
kotlinCompilerExtensionVersion = "1.5.4-dev-k1.9.20-Beta2-ac5f960bdaf"
2121
}
2222
packaging {
2323
resources {
@@ -30,20 +30,20 @@ android {
3030
}
3131
}
3232
compileOptions {
33-
sourceCompatibility = JavaVersion.VERSION_1_8
34-
targetCompatibility = JavaVersion.VERSION_1_8
33+
sourceCompatibility = JavaVersion.VERSION_17
34+
targetCompatibility = JavaVersion.VERSION_17
3535
}
3636
kotlinOptions {
37-
jvmTarget = "1.8"
37+
jvmTarget = "17"
3838
}
3939
}
4040

4141
dependencies {
4242
implementation(project(":shared"))
43-
implementation("androidx.compose.ui:ui:1.4.3")
44-
implementation("androidx.compose.ui:ui-tooling:1.4.3")
45-
implementation("androidx.compose.ui:ui-tooling-preview:1.4.3")
46-
implementation("androidx.compose.foundation:foundation:1.4.3")
47-
implementation("androidx.compose.material:material:1.4.3")
48-
implementation("androidx.activity:activity-compose:1.7.1")
43+
implementation("androidx.compose.ui:ui:1.5.3")
44+
implementation("androidx.compose.ui:ui-tooling:1.5.3")
45+
implementation("androidx.compose.ui:ui-tooling-preview:1.5.3")
46+
implementation("androidx.compose.foundation:foundation:1.5.3")
47+
implementation("androidx.compose.material:material:1.5.3")
48+
implementation("androidx.activity:activity-compose:1.8.0")
4949
}

step2/androidApp/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

Lines changed: 0 additions & 1 deletion
This file was deleted.
Binary file not shown.

step2/androidApp/build/intermediates/apk/debug/output-metadata.json

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

step2/androidApp/build/intermediates/apk_ide_redirect_file/debug/redirect.txt

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

step2/androidApp/build/intermediates/app_metadata/debug/app-metadata.properties

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

step2/androidApp/build/intermediates/compatible_screen_manifest/debug/output-metadata.json

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

0 commit comments

Comments
 (0)