Bump Kotlin to 2.3.0 and other dependencies

skydoves · skydoves · commit f818d14c07f6 · 2026-01-10T15:30:56.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,9 @@
 # Java class files
 *.class
 
+# Kotlin
+.kotlin
+
 # Generated files
 bin/
 gen/
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -33,12 +33,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-  }
-
-  kotlinOptions {
-    jvmTarget = libs.versions.jvmTarget.get()
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   lint {
@@ -54,6 +50,12 @@ android {
   }
 }
 
+kotlin {
+  compilerOptions {
+    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+  }
+}
+
 dependencies {
   implementation(project(":colorpickerview"))
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
     limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  package="com.skydoves.colorpickerviewdemo">
+  xmlns:tools="http://schemas.android.com/tools">
 
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
@@ -12,12 +12,8 @@ android {
   compileSdk = Configuration.compileSdk
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-  }
-
-  kotlinOptions {
-    jvmTarget = libs.versions.jvmTarget.get()
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   defaultConfig {
@@ -50,6 +46,12 @@ baselineProfile {
   useConnectedDevices = false
 }
 
+kotlin {
+  compilerOptions {
+    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+  }
+}
+
 dependencies {
   implementation(libs.androidx.test.runner)
   implementation(libs.androidx.test.uiautomator)
diff --git a/benchmark/src/main/java/com/skydoves/colorpickerview/benchmark/BaselineProfileGenerator.kt b/benchmark/src/main/java/com/skydoves/colorpickerview/benchmark/BaselineProfileGenerator.kt
@@ -29,7 +29,7 @@ class BaselineProfileGenerator {
 
   @Test
   fun startup() = baselineProfileRule.collect(
-    packageName = packageName,
+    packageName = PACKAGE_NAME,
     stableIterations = 2,
     maxIterations = 8,
   ) {
@@ -42,4 +42,4 @@ class BaselineProfileGenerator {
   }
 }
 
-private const val packageName = "com.skydoves.colorpickerviewdemo"
+private const val PACKAGE_NAME = "com.skydoves.colorpickerviewdemo"
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,6 @@ plugins {
   alias(libs.plugins.nexus.plugin)
   alias(libs.plugins.spotless)
   alias(libs.plugins.dokka)
-  alias(libs.plugins.kotlin.binary.compatibility)
 }
 
 subprojects {
diff --git a/buildSrc/src/main/kotlin/com/skydoves/colorpicker/Configuration.kt b/buildSrc/src/main/kotlin/com/skydoves/colorpicker/Configuration.kt
@@ -17,9 +17,9 @@
 package com.skydoves.colorpicker
 
 object Configuration {
-  const val compileSdk = 34
-  const val targetSdk = 34
-  const val minSdk = 17
+  const val compileSdk = 35
+  const val targetSdk = 35
+  const val minSdk = 21
   const val minSdkBenchmark = 23
   const val majorVersion = 2
   const val minorVersion = 3
diff --git a/colorpickerview/build.gradle.kts b/colorpickerview/build.gradle.kts
@@ -56,15 +56,22 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
-  kotlinOptions {
-    jvmTarget = libs.versions.jvmTarget.get()
+  resourcePrefix = "colorpickerview"
+}
+
+kotlin {
+  compilerOptions {
+    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
   }
 
-  resourcePrefix = "colorpickerview"
+  @OptIn(org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation::class)
+  abiValidation {
+    enabled.set(true)
+  }
 }
 
 dependencies {
diff --git a/colorpickerview/src/main/AndroidManifest.xml b/colorpickerview/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<manifest package="com.skydoves.colorpickerview"/>
+<manifest />
diff --git a/gradle.properties b/gradle.properties
@@ -65,6 +65,6 @@ POM_DEVELOPER_NAME=Jaewoong Eum
 POM_DEVELOPER_URL=https://github.com/skydoves/
 POM_DEVELOPER_EMAIL=skydoves2@gmail.com
 
-SONATYPE_HOST=DEFAULT
+SONATYPE_HOST=CENTRAL_PORTAL
 RELEASE_SIGNING_ENABLED=true
 SONATYPE_AUTOMATIC_RELEASE=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
-agp = "8.2.2"
-dokka = "1.9.20"
-kotlin = "2.0.0"
-kotlinBinaryCompatibility = "0.14.0"
-jvmTarget = "11"
-nexusPlugin = "0.28.0"
-androidxMaterial = "1.9.0"
-androidxAppcompat = "1.6.1"
-androidxMacroBenchmark = "1.2.4"
-androidxTest = "1.6.2"
-baselineProfiles = "1.3.1"
+agp = "8.13.2"
+dokka = "2.1.0"
+kotlin = "2.3.0"
+kotlinBinaryCompatibility = "0.18.1"
+jvmTarget = "17"
+nexusPlugin = "0.35.0"
+androidxMaterial = "1.13.0"
+androidxAppcompat = "1.7.1"
+androidxMacroBenchmark = "1.4.1"
+androidxTest = "1.7.0"
+baselineProfiles = "1.4.1"
 uiAutomator = "2.3.0"
-spotless = "6.21.0"
+spotless = "8.1.0"
 powerMenu = "2.2.4"
 timber = "5.0.1"
-junit = "1.1.5"
-espresso-core = "3.6.1"
+junit = "1.3.0"
+espresso-core = "3.7.0"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
@@ -40,4 +40,4 @@ androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstall
 androidx-benchmark-macro = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" }
 androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiAutomator" }
 junit = { group = "androidx.test.ext", name = "junit", version.ref = "junit" }
-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
+espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,8 @@ android {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`compileOptions {`
`36`		`- sourceCompatibility = JavaVersion.VERSION_11`
`37`		`- targetCompatibility = JavaVersion.VERSION_11`
`38`		`- }`
`39`		`-`
`40`		`- kotlinOptions {`
`41`		`- jvmTarget = libs.versions.jvmTarget.get()`
	`36`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`37`	`+ targetCompatibility = JavaVersion.VERSION_17`
`42`	`38`	`}`
`43`	`39`
`44`	`40`	`lint {`
`@@ -54,6 +50,12 @@ android {`
`54`	`50`	`}`
`55`	`51`	`}`
`56`	`52`
	`53`	`+kotlin {`
	`54`	`+ compilerOptions {`
	`55`	`+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)`
	`56`	`+ }`
	`57`	`+}`
	`58`	`+`
`57`	`59`	`dependencies {`
`58`	`60`	`implementation(project(":colorpickerview"))`
`59`	`61`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class BaselineProfileGenerator {`
`29`	`29`
`30`	`30`	`@Test`
`31`	`31`	`fun startup() = baselineProfileRule.collect(`
`32`		`- packageName = packageName,`
	`32`	`+ packageName = PACKAGE_NAME,`
`33`	`33`	`stableIterations = 2,`
`34`	`34`	`maxIterations = 8,`
`35`	`35`	`) {`
`@@ -42,4 +42,4 @@ class BaselineProfileGenerator {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`-private const val packageName = "com.skydoves.colorpickerviewdemo"`
	`45`	`+private const val PACKAGE_NAME = "com.skydoves.colorpickerviewdemo"`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ plugins {`
`21`	`21`	`alias(libs.plugins.nexus.plugin)`
`22`	`22`	`alias(libs.plugins.spotless)`
`23`	`23`	`alias(libs.plugins.dokka)`
`24`		`- alias(libs.plugins.kotlin.binary.compatibility)`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -56,15 +56,22 @@ android {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`compileOptions {`
`59`		`- sourceCompatibility = JavaVersion.VERSION_11`
`60`		`- targetCompatibility = JavaVersion.VERSION_11`
	`59`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`60`	`+ targetCompatibility = JavaVersion.VERSION_17`
`61`	`61`	`}`
`62`	`62`
`63`		`- kotlinOptions {`
`64`		`- jvmTarget = libs.versions.jvmTarget.get()`
	`63`	`+ resourcePrefix = "colorpickerview"`
	`64`	`+}`
	`65`	`+`
	`66`	`+kotlin {`
	`67`	`+ compilerOptions {`
	`68`	`+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)`
`65`	`69`	`}`
`66`	`70`
`67`		`- resourcePrefix = "colorpickerview"`
	`71`	`+ @OptIn(org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation::class)`
	`72`	`+ abiValidation {`
	`73`	`+ enabled.set(true)`
	`74`	`+ }`
`68`	`75`	`}`
`69`	`76`
`70`	`77`	`dependencies {`