Merge branch 'main' into kover-0.8

bloomberg · Oct 19, 2024 · 260057e · 260057e
2 parents 926e9f9 + cc25b12
commit 260057e
Show file tree

Hide file tree

Showing 15 changed files with 271 additions and 169 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'

diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 .vscode
 build
 .gradle
+.kotlin
 *.iml
 local.properties
 .externalNativeBuild

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 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

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.3
-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
@@ -7,7 +7,7 @@ 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" }

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 @@