From 0987d7e8d9731d24bcd56275bee61c5be9325e50 Mon Sep 17 00:00:00 2001 From: Cheon Jaeung Date: Tue, 7 Oct 2025 11:19:22 +0900 Subject: [PATCH 1/5] Upgrade gradle and AGP to 8.13.0 --- gradle/libs.versions.toml | 3 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f1b4af6..5d2f741 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] kotlin = "1.9.0" -androidGradlePlugin = "8.5.1" +androidGradlePlugin = "8.13.0" [plugins] kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } @@ -9,7 +9,6 @@ android-library = { id = "com.android.library", version.ref = "androidGradlePlug maven-publish = { id = "com.vanniktech.maven.publish", version = "0.28.0" } [libraries] -# Library Dependencies androidx-core = { group = "androidx.core", name = "core", version = "1.13.1" } androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version = "1.3.2" } androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version = "1.1.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e8425c..f49cfd2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Jul 21 14:18:49 KST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From f00a975b7d6c3fb359b0755e84581b7ec389a067 Mon Sep 17 00:00:00 2001 From: Cheon Jaeung Date: Tue, 7 Oct 2025 11:25:19 +0900 Subject: [PATCH 2/5] Upgrade kotlin to 2.2.20 --- .gitignore | 1 + build.gradle.kts | 5 +++-- gradle/libs.versions.toml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e09c9c1..2da6d57 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ *.iws .gradle/ +.kotlin/ build/ !gradle/wrapper/gradle-wrapper.jar diff --git a/build.gradle.kts b/build.gradle.kts index 090c98e..c152c20 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -19,8 +20,8 @@ allprojects { subprojects { tasks.withType { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5d2f741..c9bc7d2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "1.9.0" +kotlin = "2.2.20" androidGradlePlugin = "8.13.0" [plugins] From 062abc3d660eb1b9b8781319028ee9bec3092c63 Mon Sep 17 00:00:00 2001 From: Cheon Jaeung Date: Tue, 7 Oct 2025 11:27:22 +0900 Subject: [PATCH 3/5] Upgrade compile sdk to 36 and remove explicit target sdk from library modules --- sample/build.gradle.kts | 4 ++-- simplecarousel-pager/build.gradle.kts | 4 +--- simplecarousel/build.gradle.kts | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 32d4228..93c5c76 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -5,12 +5,12 @@ plugins { android { namespace = "${project.group}.sample" - compileSdk = 34 + compileSdk = 36 defaultConfig { applicationId = "${project.group}.sample" minSdk = 21 - targetSdk = 34 + targetSdk = 36 versionCode = 1 versionName = "${project.version}" } diff --git a/simplecarousel-pager/build.gradle.kts b/simplecarousel-pager/build.gradle.kts index b3292f2..4aa1857 100644 --- a/simplecarousel-pager/build.gradle.kts +++ b/simplecarousel-pager/build.gradle.kts @@ -8,12 +8,10 @@ plugins { android { namespace = "${project.group}.pager" - compileSdk = 34 + compileSdk = 36 defaultConfig { minSdk = 21 - targetSdk = 34 - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/simplecarousel/build.gradle.kts b/simplecarousel/build.gradle.kts index eb9069f..0a6d4e8 100644 --- a/simplecarousel/build.gradle.kts +++ b/simplecarousel/build.gradle.kts @@ -8,11 +8,10 @@ plugins { android { namespace = "${project.group}" - compileSdk = 34 + compileSdk = 36 defaultConfig { minSdk = 21 - targetSdk = 34 } compileOptions { From 1bf17a910ea3a6d56fbf486b71a59dfc0d5e52b8 Mon Sep 17 00:00:00 2001 From: Cheon Jaeung Date: Tue, 7 Oct 2025 11:31:52 +0900 Subject: [PATCH 4/5] Upgrade maven publish plugin to 0.34.0 --- gradle/libs.versions.toml | 2 +- simplecarousel-pager/build.gradle.kts | 4 +--- simplecarousel/build.gradle.kts | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c9bc7d2..d850aea 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ androidGradlePlugin = "8.13.0" kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" } -maven-publish = { id = "com.vanniktech.maven.publish", version = "0.28.0" } +maven-publish = { id = "com.vanniktech.maven.publish", version = "0.34.0" } [libraries] androidx-core = { group = "androidx.core", name = "core", version = "1.13.1" } diff --git a/simplecarousel-pager/build.gradle.kts b/simplecarousel-pager/build.gradle.kts index 4aa1857..f2025a3 100644 --- a/simplecarousel-pager/build.gradle.kts +++ b/simplecarousel-pager/build.gradle.kts @@ -1,5 +1,3 @@ -import com.vanniktech.maven.publish.SonatypeHost - plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -33,7 +31,7 @@ dependencies { } mavenPublishing { - publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) + publishToMavenCentral() signAllPublications() coordinates("${project.group}", "simplecarousel-pager", "${project.version}") diff --git a/simplecarousel/build.gradle.kts b/simplecarousel/build.gradle.kts index 0a6d4e8..1e3718b 100644 --- a/simplecarousel/build.gradle.kts +++ b/simplecarousel/build.gradle.kts @@ -1,5 +1,3 @@ -import com.vanniktech.maven.publish.SonatypeHost - plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -30,7 +28,7 @@ dependencies { } mavenPublishing { - publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) + publishToMavenCentral() signAllPublications() coordinates("${project.group}", "simplecarousel", "${project.version}") From b15f8bf9ae8b79174243228dc89f1b89ed199c4d Mon Sep 17 00:00:00 2001 From: Cheon Jaeung Date: Tue, 7 Oct 2025 11:36:46 +0900 Subject: [PATCH 5/5] Upgrade dependencies - androidx.core 1.13.1 -> 1.17.0 - androidx.recyclerview 1.3.2 -> 1.4.0 And other test dependencies and sample app dependencies --- gradle/libs.versions.toml | 16 ++++++------- .../pager/CarouselFragmentStateAdapter.kt | 24 ++++++++++++------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d850aea..7819b12 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,17 +9,17 @@ android-library = { id = "com.android.library", version.ref = "androidGradlePlug maven-publish = { id = "com.vanniktech.maven.publish", version = "0.34.0" } [libraries] -androidx-core = { group = "androidx.core", name = "core", version = "1.13.1" } -androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version = "1.3.2" } +androidx-core = { group = "androidx.core", name = "core", version = "1.17.0" } +androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version = "1.4.0" } androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version = "1.1.0" } # Test Dependencies junit = { group = "junit", name = "junit", version = "4.13.2" } -androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version = "1.2.1" } -androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version = "3.6.1" } +androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version = "1.3.0" } +androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version = "3.7.0" } # Sample Dependencies -android-material = { group = "com.google.android.material", name = "material", version = "1.12.0" } -androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" } -androidx-activity = { group = "androidx.activity", name = "activity", version = "1.9.0" } -androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.1.4" } +android-material = { group = "com.google.android.material", name = "material", version = "1.13.0" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.1" } +androidx-activity = { group = "androidx.activity", name = "activity", version = "1.11.0" } +androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.2.1" } diff --git a/simplecarousel-pager/src/main/java/com/cheonjaeung/simplecarousel/android/pager/CarouselFragmentStateAdapter.kt b/simplecarousel-pager/src/main/java/com/cheonjaeung/simplecarousel/android/pager/CarouselFragmentStateAdapter.kt index 459ca3a..d70804f 100644 --- a/simplecarousel-pager/src/main/java/com/cheonjaeung/simplecarousel/android/pager/CarouselFragmentStateAdapter.kt +++ b/simplecarousel-pager/src/main/java/com/cheonjaeung/simplecarousel/android/pager/CarouselFragmentStateAdapter.kt @@ -97,7 +97,7 @@ abstract class CarouselFragmentStateAdapter : RecyclerView.Adapter