Skip to content

Commit e5f67dc

Browse files
authored
Merge pull request #36 from Kotlin/master_meerkat
Update dependencies
2 parents 173e121 + afac9cd commit e5f67dc

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

.idea/gradle.xml

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

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11
22

33
plugins {
44
alias(libs.plugins.androidApplication)
@@ -7,17 +7,17 @@ plugins {
77

88
kotlin {
99
compilerOptions {
10-
jvmTarget = JVM_1_8
10+
jvmTarget = JVM_11
1111
}
1212
}
1313

1414
android {
15-
compileSdk = 34
15+
compileSdk = 35
1616

1717
defaultConfig {
1818
applicationId = "com.jetbrains.simplelogin.androidapp"
19-
minSdk = 21
20-
targetSdk = 34
19+
minSdk = 24
20+
targetSdk = 35
2121
versionCode = 1
2222
versionName = "1.0"
2323

@@ -34,8 +34,8 @@ android {
3434
}
3535
}
3636
compileOptions {
37-
sourceCompatibility = JavaVersion.VERSION_1_8
38-
targetCompatibility = JavaVersion.VERSION_1_8
37+
sourceCompatibility = JavaVersion.VERSION_11
38+
targetCompatibility = JavaVersion.VERSION_11
3939
}
4040
buildFeatures {
4141
viewBinding = true

gradle/libs.versions.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
[versions]
2-
android-gradlePlugin = "8.2.2"
3-
android-compileSdk = "34"
2+
android-gradlePlugin = "8.8.2"
3+
android-compileSdk = "35"
44
android-minSdk = "24"
5-
android-targetSdk = "34"
6-
androidx-activityCompose = "1.9.0"
5+
android-targetSdk = "35"
6+
androidx-activityCompose = "1.10.1"
77
androidx-appcompat = "1.7.0"
8-
androidx-constraintlayout = "2.1.4"
9-
androidx-core-ktx = "1.13.1"
8+
androidx-constraintlayout = "2.2.1"
9+
androidx-core-ktx = "1.15.0"
1010
androidx-espresso-core = "3.6.1"
1111
androidx-material = "1.12.0"
1212
androidx-test-junit = "1.2.1"
13-
annotation = "1.8.0"
14-
compose = "1.6.8"
13+
annotation = "1.9.1"
14+
compose = "1.7.8"
1515
compose-plugin = "1.6.10"
1616
imageLoader = "1.6.3"
1717
junit = "4.13.2"
18-
kotlin = "2.0.20"
19-
kotlinxCoroutinesCore = "1.8.0"
20-
ktor = "2.3.7"
21-
lifecycleLivedataKtx = "2.8.2"
18+
kotlin = "2.1.10"
19+
ktor = "3.1.0"
20+
kotlinxCoroutinesCore = "1.10.1"
21+
lifecycleLivedataKtx = "2.8.7"
2222
voyagerNavigator = "1.0.0"
2323

2424
[libraries]

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)