Merge pull request #505 from kennethshackleton/move-selekt-sqlite3

Rename SQLite3 subproject, because it does not publish an artifact.
bloomberg · Feb 5, 2024 · 5a688b2 · 5a688b2
2 parents 6ad0654 + dec0623
commit 5a688b2
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 11 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/selekt-sqlite3/CMakeLists.txt → SQLite3/CMakeLists.txt b/selekt-sqlite3/CMakeLists.txt → SQLite3/CMakeLists.txt
diff --git a/selekt-sqlite3/build.gradle.kts → SQLite3/build.gradle.kts b/selekt-sqlite3/build.gradle.kts → SQLite3/build.gradle.kts
diff --git a/selekt-sqlite3/sqlite3/CMakeLists.txt → SQLite3/sqlite3/CMakeLists.txt b/selekt-sqlite3/sqlite3/CMakeLists.txt → SQLite3/sqlite3/CMakeLists.txt
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
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
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
diff --git a/selekt-sqlite3/sqlite3_jni.cpp → SQLite3/sqlite3_jni.cpp b/selekt-sqlite3/sqlite3_jni.cpp → SQLite3/sqlite3_jni.cpp
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/selekt-android-sqlcipher/build.gradle.kts b/selekt-android-sqlcipher/build.gradle.kts
@@ -58,7 +58,7 @@ android {
     }
     externalNativeBuild {
         cmake {
-            path("$rootDir/selekt-sqlite3/CMakeLists.txt")
+            path("$rootDir/SQLite3/CMakeLists.txt")
             version = Versions.CMAKE.version
         }
     }
@@ -76,7 +76,7 @@ allABIs.forEach { abi ->
     tasks.matching {
         it is ExternalNativeBuildJsonTask && it.name.contains(abi)
     }.configureEach {
-        dependsOn(":OpenSSL:assemble${abi.replaceFirstChar(Char::uppercaseChar)}", ":selekt-sqlite3:amalgamate")
+        dependsOn(":OpenSSL:assemble${abi.replaceFirstChar(Char::uppercaseChar)}", ":SQLite3:amalgamate")
     }
 }
 

diff --git a/selekt-android/build.gradle.kts b/selekt-android/build.gradle.kts
@@ -88,14 +88,14 @@ koverReport {
 
 tasks.register<Copy>("copyJniLibs") {
     from(
-        fileTree(project(":selekt-sqlite3").layout.buildDirectory.dir("intermediates/libs")),
+        fileTree(project(":SQLite3").layout.buildDirectory.dir("intermediates/libs")),
         fileTree(project(":Selektric").layout.buildDirectory.dir("intermediates/libs"))
     )
     into(layout.buildDirectory.dir("intermediates/libs/jni"))
 }
 
 tasks.register<Task>("buildNativeHost") {
-    dependsOn(":selekt-sqlite3:buildHost", ":Selektric:buildHost")
+    dependsOn(":SQLite3:buildHost", ":Selektric:buildHost")
     finalizedBy("copyJniLibs")
 }
 

diff --git a/selekt-java/build.gradle.kts b/selekt-java/build.gradle.kts
@@ -85,13 +85,13 @@ tasks.register<Test>("integrationTest") {
 }
 
 tasks.register<Task>("buildHostSQLite") {
-    dependsOn(":selekt-sqlite3:buildHost", "copyJniLibs")
+    dependsOn(":SQLite3:buildHost", "copyJniLibs")
 }
 
 tasks.register<Copy>("copyJniLibs") {
-    from(fileTree(project(":selekt-sqlite3").layout.buildDirectory.dir("intermediates/libs")))
+    from(fileTree(project(":SQLite3").layout.buildDirectory.dir("intermediates/libs")))
     into(layout.buildDirectory.dir("intermediates/libs/jni"))
-    mustRunAfter(":selekt-sqlite3:buildHost")
+    mustRunAfter(":SQLite3:buildHost")
 }
 
 tasks.withType<ProcessResources>().configureEach {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -20,13 +20,13 @@ include(":AndroidCLI")
 include(":AndroidLibBenchmark")
 include(":OpenSSL")
 include(":Selektric")
+include(":SQLite3")
 include(":selekt-android")
 include(":selekt-android-lint")
 include(":selekt-android-sqlcipher")
 include(":selekt-api")
 include(":selekt-bom")
 include(":selekt-java")
-include(":selekt-sqlite3")
 include(":selekt-sqlite3-classes")
 
 pluginManagement {