Merge branch 'main' into sqlcipher-4.5.6

Signed-off-by: Kenneth J. Shackleton <[email protected]>
bloomberg · Feb 5, 2024 · fe2e657 · fe2e657
2 parents e8ec813 + 5a688b2
commit fe2e657
Show file tree

Hide file tree

Showing 204 changed files with 427 additions and 285 deletions.
diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml
@@ -35,7 +35,7 @@ jobs:
           :OpenSSL:assembleArmeabi-v7a \
           :OpenSSL:assembleX86 \
           :OpenSSL:assembleX86_64
-        ./gradlew :selekt-sqlite3:amalgamate
+        ./gradlew :SQLite3:amalgamate
         ./gradlew assembleRelease
     - name: 'Publish snapshot to OSSRH'
       if: github.event_name == 'push'

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "selekt-sqlite3/src/main/external/sqlcipher"]
-	path = selekt-sqlite3/src/main/external/sqlcipher
+[submodule "SQLite3/src/main/external/sqlcipher"]
+	path = SQLite3/src/main/external/sqlcipher
 	url = https://github.com/sqlcipher/sqlcipher.git
diff --git a/AndroidCLI/build.gradle.kts b/AndroidCLI/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 plugins {
     id("com.android.application")
     id("kotlin-android")
+    id("io.gitlab.arturbosch.detekt")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
 repositories {

diff --git a/AndroidCLI/src/main/kotlin/com/bloomberg/selekt/cli/CLIActivity.kt b/AndroidCLI/src/main/kotlin/com/bloomberg/selekt/cli/CLIActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/AndroidLibBenchmark/build.gradle.kts b/AndroidLibBenchmark/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
     id("androidx.benchmark") version Versions.ANDROID_BENCHMARK.version
+    id("io.gitlab.arturbosch.detekt")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
 repositories {

diff --git a/.../src/androidTest/kotlin/com/bloomberg/selekt/android/benchmark/SQLiteDatabaseBenchmark.kt b/.../src/androidTest/kotlin/com/bloomberg/selekt/android/benchmark/SQLiteDatabaseBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/.../androidTest/kotlin/com/bloomberg/selekt/android/benchmark/SQLiteDatabaseBlobBenchmark.kt b/.../androidTest/kotlin/com/bloomberg/selekt/android/benchmark/SQLiteDatabaseBlobBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...androidTest/kotlin/com/bloomberg/selekt/android/benchmark/SQLiteDatabaseCacheBenchmark.kt b/...androidTest/kotlin/com/bloomberg/selekt/android/benchmark/SQLiteDatabaseCacheBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...androidTest/kotlin/com/bloomberg/selekt/android/benchmark/SQLiteDatabaseIndexBenchmark.kt b/...androidTest/kotlin/com/bloomberg/selekt/android/benchmark/SQLiteDatabaseIndexBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...st/kotlin/com/bloomberg/selekt/android/benchmark/SQLiteDatabaseTransactedReadBenchmark.kt b/...st/kotlin/com/bloomberg/selekt/android/benchmark/SQLiteDatabaseTransactedReadBenchmark.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,29 @@
 Change Log
 ==========
 
+## Version 0.22.0
+
+Warning: This release decouples the choice of SQLite implementation from the main Android artifact, and requires an additional dependency declaration. Please refer to the [getting started](https://bloomberg.github.io/selekt/getting_started/#integration) guide.
+
+### Fixes
+
+* Use Kotlin's `Enum.entries` instead of `Enum.values()`.
+* Decouple the choice of SQLite implementation from the main Android artifact.
+* Publish a BOM.
+
+### Dependencies
+
+* Android SDK 34.
+* Dokka 1.9.10.
+* Gradle 8.6.
+* Junit 5.10.1.
+* Kotlin 1.9.22.
+* Kotlin Coroutines 1.7.3.
+* Mockito 5.10.0.
+* Mockito-Kotlin 5.2.1.
+* NDK 26.1.
+* Room 2.6.1.
+
 ## Version 0.21.0
 
 Warning: This release migrates from OpenSSL 1.1.1v to OpenSSL 3.1.2.

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/LICENSE b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Bloomberg Finance L.P.
+   Copyright 2020 Bloomberg Finance L.P.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/OpenSSL/build.gradle.kts b/OpenSSL/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/selekt-sqlite3/CMakeLists.txt → SQLite3/CMakeLists.txt b/selekt-sqlite3/CMakeLists.txt → SQLite3/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2022 Bloomberg Finance L.P.
+# Copyright 2020 Bloomberg Finance L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/selekt-sqlite3/build.gradle.kts → SQLite3/build.gradle.kts b/selekt-sqlite3/build.gradle.kts → SQLite3/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,14 +18,8 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.Locale
 
-repositories {
-    mavenCentral()
-}
-
 plugins {
-    kotlin("jvm")
-    `maven-publish`
-    signing
+    base
 }
 
 val cFlags = arrayOf(
@@ -64,23 +58,6 @@ val cFlags = arrayOf(
     "-DSQLITE_USE_URI=1"
 )
 
-disableKotlinCompilerAssertions()
-
-java {
-    withJavadocJar()
-    withSourcesJar()
-}
-
-publishing {
-    publications.register<MavenPublication>("main") {
-        from(components.getByName("java"))
-        pom {
-            commonInitialisation(project)
-            description.set("Selekt Java SQLite interface library.")
-        }
-    }
-}
-
 tasks.register<Exec>("configureSqlCipher") {
     workingDir = File("$projectDir/src/main/external/sqlcipher")
     commandLine("./configure")

diff --git a/selekt-sqlite3/sqlite3/CMakeLists.txt → SQLite3/sqlite3/CMakeLists.txt b/selekt-sqlite3/sqlite3/CMakeLists.txt → SQLite3/sqlite3/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2022 Bloomberg Finance L.P.
+# Copyright 2020 Bloomberg Finance L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/selekt-sqlite3/sqlite3/SelektConfig.h.in → SQLite3/sqlite3/SelektConfig.h.in b/selekt-sqlite3/sqlite3/SelektConfig.h.in → SQLite3/sqlite3/SelektConfig.h.in
diff --git a/...qlite3/include/bloomberg/AutoJByteArray.h → ...qlite3/include/bloomberg/AutoJByteArray.h b/...qlite3/include/bloomberg/AutoJByteArray.h → ...qlite3/include/bloomberg/AutoJByteArray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...qlite3/sqlite3/include/bloomberg/Throws.h → SQLite3/sqlite3/include/bloomberg/Throws.h b/...qlite3/sqlite3/include/bloomberg/Throws.h → SQLite3/sqlite3/include/bloomberg/Throws.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...t-sqlite3/sqlite3/include/bloomberg/log.h → SQLite3/sqlite3/include/bloomberg/log.h b/...t-sqlite3/sqlite3/include/bloomberg/log.h → SQLite3/sqlite3/include/bloomberg/log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/selekt-sqlite3/sqlite3_jni.cpp → SQLite3/sqlite3_jni.cpp b/selekt-sqlite3/sqlite3_jni.cpp → SQLite3/sqlite3_jni.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/selekt-sqlite3/src/main/external/sqlcipher → SQLite3/src/main/external/sqlcipher b/selekt-sqlite3/src/main/external/sqlcipher → SQLite3/src/main/external/sqlcipher
diff --git a/Selektric/build.gradle.kts b/Selektric/build.gradle.kts
@@ -18,10 +18,6 @@ import java.util.Locale
 import java.nio.file.Files
 import java.nio.file.Paths
 
-repositories {
-    mavenCentral()
-}
-
 plugins {
     base
 }

diff --git a/Selektric/native_mocks.cpp b/Selektric/native_mocks.cpp
@@ -36,7 +36,7 @@ static jstring SystemProperties_get(
     jstring keyJ,
     jstring defJ
 ) {
-    auto key = env->GetStringUTFChars(keyJ, NULL);
+    auto key = env->GetStringUTFChars(keyJ, nullptr);
     if (strcmp("ro.product.cpu.abilist", key)) {
         env->ReleaseStringUTFChars(keyJ, key);
         return env->NewStringUTF("arm64-v8a,armeabi-v7a");

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,15 +65,13 @@ dependencies {
     kover(projects.selektAndroid)
     kover(projects.selektApi)
     kover(projects.selektJava)
+    kover(projects.selektSqlite3Classes)
     ktlint("com.pinterest:ktlint:${Versions.KTLINT}")
 }
 
 subprojects {
     group = rootProject.group
     version = rootProject.version
-    apply {
-        plugin("io.gitlab.arturbosch.detekt")
-    }
     plugins.withType<JavaPlugin>().configureEach {
         tasks.withType<Jar>().configureEach {
             metaInf {
@@ -156,14 +154,16 @@ subprojects {
             systemProperty(it.key, it.value)
         }
     }
-    configure<DetektExtension> {
-        toolVersion = Versions.DETEKT.version
-        source = files("src")
-        config = files("${rootProject.projectDir}/config/detekt/config.yml")
-        buildUponDefaultConfig = true
-        parallel = false
-        debug = false
-        ignoreFailures = false
+    plugins.withId("io.gitlab.arturbosch.detekt") {
+        configure<DetektExtension> {
+            toolVersion = Versions.DETEKT.version
+            source = files("src")
+            config = files("${rootProject.projectDir}/config/detekt/config.yml")
+            buildUponDefaultConfig = true
+            parallel = false
+            debug = false
+            ignoreFailures = false
+        }
     }
     tasks.withType<Detekt>().configureEach {
         exclude("**/res/**")
@@ -202,14 +202,13 @@ subprojects {
 }
 
 allprojects {
-    apply {
-        plugin("org.jlleitschuh.gradle.ktlint")
-    }
-    configure<KtlintExtension> {
-        version.set(Versions.KTLINT.version)
-        disabledRules.set(setOf("import-ordering", "indent", "wrapping"))
-        reporters {
-            reporter(ReporterType.HTML)
+    plugins.withId("org.jlleitschuh.gradle.ktlint") {
+        configure<KtlintExtension> {
+            version.set(Versions.KTLINT.version)
+            disabledRules.set(setOf("import-ordering", "indent", "wrapping"))
+            reporters {
+                reporter(ReporterType.HTML)
+            }
         }
     }
     tasks.withType<GenerateReportsTask>().configureEach {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 // TODO Move me.
-val kotlinVersion = "1.9.10"
+val kotlinVersion = "1.9.22"
 
 plugins {
     `kotlin-dsl`

diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/buildSrc/src/main/kotlin/JmhPlugin.kt b/buildSrc/src/main/kotlin/JmhPlugin.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/buildSrc/src/main/kotlin/SelektExtensions.kt b/buildSrc/src/main/kotlin/SelektExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Bloomberg Finance L.P.
+ * Copyright 2020 Bloomberg Finance L.P.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,27 +25,27 @@ enum class Versions(
     ANDROID_GRADLE_PLUGIN("8.0.2", URL("https://developer.android.com/tools/revisions/gradle-plugin.html")),
     ANDROID_LINT("30.0.2", URL("https://github.com/googlesamples/android-custom-lint-rules")),
     ANDROID_NDK("26.1.10909125", URL("https://developer.android.com/ndk")),
-    ANDROID_SDK("33", URL("https://developer.android.com/sdk")),
+    ANDROID_SDK("34", URL("https://developer.android.com/sdk")),
     ANDROIDX_LIVE_DATA("2.5.1", URL("https://developer.android.com/topic/libraries/architecture/livedata")),
-    ANDROIDX_ROOM("2.5.1", URL("https://developer.android.com/jetpack/androidx/releases/room")),
+    ANDROIDX_ROOM("2.6.1", URL("https://developer.android.com/jetpack/androidx/releases/room")),
     CMAKE("3.22.1", URL("https://cmake.org")),
     DETEKT("1.22.0", URL("https://github.com/arturbosch/detekt")),
-    DOKKA("1.8.20", URL("https://github.com/Kotlin/dokka")),
+    DOKKA("1.9.10", URL("https://github.com/Kotlin/dokka")),
     GRADLE_DOWNLOAD_TASK_PLUGIN("5.4.0", URL("https://github.com/michel-kraemer/gradle-download-task")),
     GRADLE_LICENSEE_PLUGIN("1.6.0", URL("https://github.com/cashapp/licensee")),
     IDE_EXT_GRADLE_PLUGIN("1.1.7", URL("https://github.com/JetBrains/gradle-idea-ext-plugin")),
     JMH("1.36", URL("https://openjdk.java.net/projects/code-tools/jmh/")),
     JSR_305("3.0.2", URL("https://code.google.com/archive/p/jsr-305/")),
     JUNIT4("4.13.2", URL("https://github.com/junit-team/junit4")),
-    JUNIT5("5.9.3", URL("https://junit.org/junit5/")),
-    KOTLIN("1.9.10", URL("https://github.com/JetBrains/kotlin")),
+    JUNIT5("5.10.1", URL("https://junit.org/junit5/")),
+    KOTLIN("1.9.22", URL("https://github.com/JetBrains/kotlin")),
     KOTLIN_TEST(KOTLIN.version, URL("https://github.com/JetBrains/kotlin")),
-    KOTLINX_COROUTINES("1.7.2", URL("https://github.com/Kotlin/kotlinx.coroutines")),
+    KOTLINX_COROUTINES("1.7.3", URL("https://github.com/Kotlin/kotlinx.coroutines")),
     KOTLINX_KOVER("0.7.2", URL("https://github.com/Kotlin/kotlinx-kover")),
     KTLINT("0.45.2", URL("https://github.com/pinterest/ktlint")),
     KTLINT_GRADLE_PLUGIN("11.5.0", URL("https://github.com/JLLeitschuh/ktlint-gradle")),
-    MOCKITO("5.4.0", URL("https://github.com/mockito/mockito")),
-    MOCKITO_KOTLIN("5.0.0", URL("https://github.com/mockito/mockito-kotlin")),
+    MOCKITO("5.10.0", URL("https://github.com/mockito/mockito")),
+    MOCKITO_KOTLIN("5.2.1", URL("https://github.com/mockito/mockito-kotlin")),
     NEXUS_PLUGIN("1.3.0", URL("https://github.com/gradle-nexus/publish-plugin")),
     QODANA_PLUGIN("0.1.12", URL("https://www.jetbrains.com/help/qodana/qodana-gradle-plugin.html")),
     ROBOLECTRIC_ANDROID_ALL("12.1-robolectric-8229987", URL("https://github.com/robolectric/robolectric"));