Merge branch 'main' into replace-scheduleAtFixedRate

bloomberg · Aug 18, 2024 · 58d1db6 · 58d1db6
2 parents 553570f + 8e6469d
commit 58d1db6
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 25 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -77,7 +77,7 @@ jobs:
         ./gradlew :koverVerify -x integrationTest
     - name: 'Build others'
       run: |
-        ./gradlew assembleAndroidTest :AndroidCLI:assembleDebug :selekt-android-lint:assemble jmhClasses
+        ./gradlew assembleAndroidTest :AndroidCLI:assembleDebug :selekt-android-lint:assemble dokkaHtml
     - name: 'Tear down'
       if: always()
       run: |

diff --git a/AndroidCLI/build.gradle.kts b/AndroidCLI/build.gradle.kts
@@ -28,7 +28,7 @@ repositories {
 
 android {
     compileSdk = Versions.ANDROID_SDK.version.toInt()
-    buildToolsVersion = libs.android.tools.gradle.get().version!!
+    buildToolsVersion = "34.0.0"
     namespace = "com.bloomberg.selekt.cli"
     defaultConfig {
         applicationId = "com.bloomberg.selekt.cli"

diff --git a/AndroidLibBenchmark/build.gradle.kts b/AndroidLibBenchmark/build.gradle.kts
@@ -29,7 +29,7 @@ repositories {
 
 android {
     compileSdkVersion(Versions.ANDROID_SDK.version.toInt())
-    buildToolsVersion(libs.android.tools.gradle.get().version!!)
+    buildToolsVersion("34.0.0")
     namespace = "com.bloomberg.selekt.android.benchmark"
     defaultConfig {
         minSdkVersion(21)
@@ -49,6 +49,7 @@ android {
 
 dependencies {
     androidTestImplementation(projects.selektAndroid)
+    androidTestImplementation(projects.selektJava)
     androidTestImplementation(libs.androidx.benchmark.junit4)
     androidTestImplementation(libs.androidx.test.ext)
     androidTestImplementation(libs.androidx.test.rules)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Change Log
 ==========
 
+## Version 0.22.2
+
+### Dependencies
+
+* Android Gradle Plugin 8.5.2.
+* Gradle 8.10.
+* Kotlin 1.9.24.
+* NDK 27.
+
 ## Version 0.22.1
 
 ### Dependencies

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -40,6 +40,7 @@ plugins {
     alias(libs.plugins.ktlint)
     alias(libs.plugins.ideaExt)
     alias(libs.plugins.qodana)
+    alias(libs.plugins.ksp) apply false
 }
 
 repositories {

diff --git a/buildSrc/src/main/kotlin/JmhPlugin.kt b/buildSrc/src/main/kotlin/JmhPlugin.kt
@@ -32,7 +32,7 @@ class JmhPlugin : Plugin<Project> {
                 add(name, project)
                 add(name, "org.openjdk.jmh:jmh-core:${Versions.JMH}")
             }
-            configurations.getByName("kaptJmh") {
+            configurations.getByName("kspJmh") {
                 add(name, "org.openjdk.jmh:jmh-generator-annprocess:${Versions.JMH}")
             }
         }

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-selekt.versionName=0.22.1
+selekt.versionName=0.22.2
 selekt.nextVersionName=0.23.0
 
 openssl.version=3.1.2

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" }
 junit-junit = { group = "junit", name = "junit", version = "4.13.2" }
 junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version = "5.10.2" }
-kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version = "1.9.24" }
+kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version = "2.0.10" }
 kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect" }
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test" }
 kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit" }
@@ -46,6 +46,7 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.22.0" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
 ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version = "1.1.7" }
 kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.6" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.10-1.0.24" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.5.0" }
 nexus = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
 qodana = { id = "org.jetbrains.qodana", version = "0.1.12" }

diff --git a/selekt-android-sqlcipher/build.gradle.kts b/selekt-android-sqlcipher/build.gradle.kts
@@ -38,9 +38,9 @@ val allABIs = listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
 
 android {
     compileSdk = Versions.ANDROID_SDK.version.toInt()
-    buildToolsVersion = libs.android.tools.gradle.get().version!!
+    buildToolsVersion = "34.0.0"
     namespace = "com.bloomberg.selekt.android.sqlcipher"
-    ndkVersion = "26.3.11579264"
+    ndkVersion = "27.0.12077973"
     defaultConfig {
         minSdk = 21
     }

diff --git a/selekt-android/build.gradle.kts b/selekt-android/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
     id("kotlin-android")
     alias(libs.plugins.dokka)
     alias(libs.plugins.cash.licensee)
-    kotlin("kapt")
+    alias(libs.plugins.ksp)
     `maven-publish`
     signing
     alias(libs.plugins.kover)
@@ -37,7 +37,7 @@ repositories {
 
 android {
     compileSdk = Versions.ANDROID_SDK.version.toInt()
-    buildToolsVersion = libs.android.tools.gradle.get().version!!
+    buildToolsVersion = "34.0.0"
     namespace = "com.bloomberg.selekt.android"
     defaultConfig {
         minSdk = 21
@@ -64,7 +64,7 @@ dependencies {
     compileOnly(libs.androidx.room.runtime)
     implementation(projects.selektJava)
     implementation(projects.selektSqlite3Classes)
-    kaptTest(libs.androidx.room.compiler)
+    kspTest(libs.androidx.room.compiler)
     testImplementation(libs.androidx.lifecycle.livedata.ktx)
     testImplementation(libs.androidx.room.runtime)
     testImplementation(libs.androidx.room.ktx)

diff --git a/selekt-java/build.gradle.kts b/selekt-java/build.gradle.kts
@@ -16,23 +16,19 @@
 
 @file:Suppress("UnstableApiUsage")
 
-import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.dokka.gradle.DokkaTaskPartial
-
 repositories {
     mavenCentral()
     google()
 }
 
 plugins {
     kotlin("jvm")
-    kotlin("kapt")
+    alias(libs.plugins.ksp)
     id("com.android.lint")
     alias(libs.plugins.kover)
     alias(libs.plugins.dokka)
     `maven-publish`
     signing
-    id("bb-jmh")
     alias(libs.plugins.detekt)
     alias(libs.plugins.ktlint)
 }
@@ -62,7 +58,6 @@ val integrationTestRuntimeOnly: Configuration by configurations.getting {
 dependencies {
     implementation(projects.selektApi)
     implementation(projects.selektSqlite3Classes)
-    jmhImplementation(libs.kotlinx.coroutines.core)
 }
 
 publishing {
@@ -99,11 +94,3 @@ tasks.register<Copy>("copyJniLibs") {
 tasks.withType<ProcessResources>().configureEach {
     dependsOn("buildHostSQLite")
 }
-
-tasks.withType<DokkaTask>().configureEach {
-    dependsOn("kaptKotlin") // FIXME Remove?
-}
-
-tasks.withType<DokkaTaskPartial>().configureEach {
-    dependsOn("kaptKotlin") // FIXME Remove?
-}