Merge branch 'main' into lru-opti

bloomberg · Oct 19, 2024 · 10af057 · 10af057
2 parents b5fcc6f + cc25b12
commit 10af057
Show file tree

Hide file tree

Showing 21 changed files with 301 additions and 194 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -53,15 +53,15 @@ jobs:
       run: ./gradlew licensee --no-configuration-cache
     - name: 'Analyse'
       run: ./gradlew detekt ktlintCheck lint -x lintRelease ${{ env.SCAN }}
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: 'Analyses'
         path: |
           **/build/reports/detekt
     - name: 'Unit tests'
       run: ./gradlew :selekt-android:testDebugUnitTest :selekt-java:test :koverHtmlReport -x integrationTest ${{ env.SCAN }}
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: 'Unit test and coverage reports'
@@ -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/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 .vscode
 build
 .gradle
+.kotlin
 *.iml
 local.properties
 .externalNativeBuild

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,28 @@
 Change Log
 ==========
 
+## Version 0.23.0
+
+### Fixes
+
+* Replace use of `ScheduledExecutorService.scheduleAtFixedRate` with `ScheduledExecutorService.scheduleWithFixedDelay` when evicting from the connection pools. `ScheduledExecutorService.scheduleAtFixedRate` is an API discouraged by Android Lint.
+* Support compiling 16 KB-aligned shared libraries with Android NDK version r27 and higher.
+
+## Version 0.22.3
+
+### Dependencies
+
+* Kotlin 2.0.20.
+
+## 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/docs/getting_started.md b/docs/getting_started.md
@@ -22,7 +22,7 @@
     }
 
     dependencies {
-        implementation platform('com.bloomberg:selekt-bom:<version>'))
+        implementation platform('com.bloomberg:selekt-bom:<version>')
         implementation 'com.bloomberg:selekt-android'
         runtimeOnly 'com.bloomberg:selekt-android-sqlcipher'
     }

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-selekt.versionName=0.22.1
-selekt.nextVersionName=0.23.0
+selekt.versionName=0.23.0
+selekt.nextVersionName=0.24.0
 
 openssl.version=3.1.2
 openssl.sha256=a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 # https://docs.gradle.org/current/userguide/platforms.html#sub:conventional-dependencies-toml
 
 [versions]
-benchmark = "1.2.4"
+benchmark = "1.3.0"
 jmh = "1.37"
 lint = "31.5.2"
 room = "2.6.1"
 
 [libraries]
-android-tools-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.5.2" }
+android-tools-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.6.0" }
 android-tools-lint = { group = "com.android.tools.lint", name = "lint", version.ref = "lint" }
 android-tools-lint-api = { group = "com.android.tools.lint", name = "lint-api", version.ref = "lint" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" }
@@ -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.20" }
 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.20-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/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,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=682b4df7fe5accdca84a4d1ef6a3a6ab096b3efd5edf7de2bd8c758d95a93703
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
+distributionSha256Sum=fdfca5dbc2834f0ece5020465737538e5ba679deeff5ab6c09621d67f8bb1a15
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-all.zip
 networkTimeout=120000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     .vscode
     build
     .gradle
+    .kotlin
     *.iml
     local.properties
     .externalNativeBuild
@@ Expand Down @@