Skip to content

Commit 322a907

Browse files
authored
Bump Kotlin 2.2.10 and Compose to the latest version (#38)
1 parent b48bf7a commit 322a907

File tree

8 files changed

+30
-29
lines changed

8 files changed

+30
-29
lines changed

baselineprofile/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
android {
1010
namespace = "com.skydoves.pokedex.compose.baselineprofile"
11-
compileSdk = 35
11+
compileSdk = 36
1212

1313
compileOptions {
1414
sourceCompatibility = JavaVersion.VERSION_17
@@ -17,7 +17,7 @@ android {
1717

1818
defaultConfig {
1919
minSdk = 24
20-
targetSdk = 35
20+
targetSdk = 36
2121
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2222
}
2323

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
1717

1818
extensions.configure<BaseAppModuleExtension> {
1919
configureKotlinAndroid(this)
20-
defaultConfig.targetSdk = 35
20+
defaultConfig.targetSdk = 36
2121
}
2222

2323
extensions.getByType<KotlinAndroidProjectExtension>().apply {

build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
2727
extensions.configure<LibraryExtension> {
2828
configureKotlinAndroid(this)
2929
configureAndroidCompose(this)
30-
defaultConfig.targetSdk = 35
30+
defaultConfig.targetSdk = 36
3131
}
3232

3333
extensions.getByType<KotlinAndroidProjectExtension>().apply {

build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
1616

1717
extensions.configure<LibraryExtension> {
1818
configureKotlinAndroid(this)
19-
defaultConfig.targetSdk = 35
19+
defaultConfig.targetSdk = 36
2020
}
2121

2222
extensions.getByType<KotlinAndroidProjectExtension>().apply {

build-logic/convention/src/main/kotlin/com/skydoves/pokedex/compose/KotlinAndroid.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ internal fun Project.configureKotlinAndroid(
1313
commonExtension: CommonExtension<*, *, *, *, *, *>,
1414
) {
1515
commonExtension.apply {
16-
compileSdk = 35
16+
compileSdk = 36
1717

1818
defaultConfig {
1919
minSdk = 21

core/designsystem/src/main/kotlin/com/skydoves/pokedex/compose/core/designsystem/component/PokedexSharedElement.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fun Modifier.pokedexSharedElement(
4444
this
4545
} else {
4646
this.sharedElement(
47-
state = state,
47+
sharedContentState = state,
4848
animatedVisibilityScope = animatedVisibilityScope,
4949
boundsTransform = boundsTransform,
5050
placeHolderSize = placeHolderSize,

gradle/libs.versions.toml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
[versions]
2-
agp = "8.7.3"
3-
kotlin = "2.1.10"
4-
ksp = "2.1.10-1.0.31"
5-
kotlinxImmutable = "0.3.7"
6-
androidxActivity = "1.9.3"
7-
androidxCore = "1.15.0"
8-
androidxLifecycle = "2.8.7"
9-
androidxRoom = "2.6.1"
2+
agp = "8.12.0"
3+
kotlin = "2.2.10"
4+
ksp = "2.2.0-2.0.2"
5+
kotlinxImmutable = "0.4.0"
6+
androidxActivity = "1.10.1"
7+
androidxCore = "1.17.0"
8+
androidxLifecycle = "2.9.2"
9+
androidxRoom = "2.7.2"
1010
androidxArchCore = "2.2.0"
1111
androidXStartup = "1.2.0"
12-
androidxCompose = "1.7.8"
13-
androidxComposeMaterial3 = "1.3.1"
14-
androidxNavigation = "2.8.5"
12+
androidxCompose = "1.9.0"
13+
androidxComposeMaterial3 = "1.3.2"
14+
androidxNavigation = "2.9.3"
1515
androidxHiltNavigationCompose = "1.2.0"
16-
composeStableMarker = "1.0.5"
17-
kotlinxSerializationJson = "1.7.3"
18-
hilt = "2.56.1"
19-
retrofit = "2.11.0"
20-
okHttp = "4.12.0"
21-
sandwich = "2.0.10"
22-
landscapist = "2.4.6"
23-
coroutines = "1.9.0"
16+
composeStableMarker = "1.0.6"
17+
kotlinxSerializationJson = "1.9.0"
18+
hilt = "2.57"
19+
retrofit = "3.0.0"
20+
okHttp = "5.1.0"
21+
sandwich = "2.1.2"
22+
landscapist = "2.5.1"
23+
coroutines = "1.10.2"
2424
profileInstaller = "1.4.1"
25-
macroBenchmark = "1.3.3"
25+
macroBenchmark = "1.4.0"
2626
uiAutomator = "2.3.0"
2727
truth = "1.4.4"
2828
junit = "4.13.2"
@@ -35,7 +35,7 @@ espresso = "3.5.1"
3535
mockito = "5.11.0"
3636
mockito-kotlin = "5.4.0"
3737
spotless = "6.25.0"
38-
baselineprofile = "1.3.3"
38+
baselineprofile = "1.4.0"
3939

4040
[libraries]
4141
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidxRoom" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
#Fri Aug 15 17:08:54 KST 2025
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
45
networkTimeout=10000
56
validateDistributionUrl=true
67
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)