From 066096ee934d4f3eac3bb39fdd7d555a37cc89e1 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Mon, 5 Feb 2024 11:43:43 +0000 Subject: [PATCH] Rename SQLite3 subproject, because it does not publish an artifact. Signed-off-by: Kenneth J. Shackleton --- .github/workflows/publication.yml | 2 +- .gitmodules | 4 ++-- {selekt-sqlite3 => SQLite3}/CMakeLists.txt | 0 {selekt-sqlite3 => SQLite3}/build.gradle.kts | 0 {selekt-sqlite3 => SQLite3}/sqlite3/CMakeLists.txt | 0 {selekt-sqlite3 => SQLite3}/sqlite3/SelektConfig.h.in | 0 .../sqlite3/include/bloomberg/AutoJByteArray.h | 0 .../sqlite3/include/bloomberg/Throws.h | 0 {selekt-sqlite3 => SQLite3}/sqlite3/include/bloomberg/log.h | 0 {selekt-sqlite3 => SQLite3}/sqlite3_jni.cpp | 0 {selekt-sqlite3 => SQLite3}/src/main/external/sqlcipher | 0 selekt-android-sqlcipher/build.gradle.kts | 4 ++-- selekt-android/build.gradle.kts | 4 ++-- selekt-java/build.gradle.kts | 6 +++--- settings.gradle.kts | 2 +- 15 files changed, 11 insertions(+), 11 deletions(-) rename {selekt-sqlite3 => SQLite3}/CMakeLists.txt (100%) rename {selekt-sqlite3 => SQLite3}/build.gradle.kts (100%) rename {selekt-sqlite3 => SQLite3}/sqlite3/CMakeLists.txt (100%) rename {selekt-sqlite3 => SQLite3}/sqlite3/SelektConfig.h.in (100%) rename {selekt-sqlite3 => SQLite3}/sqlite3/include/bloomberg/AutoJByteArray.h (100%) rename {selekt-sqlite3 => SQLite3}/sqlite3/include/bloomberg/Throws.h (100%) rename {selekt-sqlite3 => SQLite3}/sqlite3/include/bloomberg/log.h (100%) rename {selekt-sqlite3 => SQLite3}/sqlite3_jni.cpp (100%) rename {selekt-sqlite3 => SQLite3}/src/main/external/sqlcipher (100%) diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml index 8b13e23b17..33915c7a82 100644 --- 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 index 30b762fc1c..807e824854 100644 --- 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 b/SQLite3/CMakeLists.txt similarity index 100% rename from selekt-sqlite3/CMakeLists.txt rename to SQLite3/CMakeLists.txt diff --git a/selekt-sqlite3/build.gradle.kts b/SQLite3/build.gradle.kts similarity index 100% rename from selekt-sqlite3/build.gradle.kts rename to SQLite3/build.gradle.kts diff --git a/selekt-sqlite3/sqlite3/CMakeLists.txt b/SQLite3/sqlite3/CMakeLists.txt similarity index 100% rename from selekt-sqlite3/sqlite3/CMakeLists.txt rename to SQLite3/sqlite3/CMakeLists.txt diff --git a/selekt-sqlite3/sqlite3/SelektConfig.h.in b/SQLite3/sqlite3/SelektConfig.h.in similarity index 100% rename from selekt-sqlite3/sqlite3/SelektConfig.h.in rename to SQLite3/sqlite3/SelektConfig.h.in diff --git a/selekt-sqlite3/sqlite3/include/bloomberg/AutoJByteArray.h b/SQLite3/sqlite3/include/bloomberg/AutoJByteArray.h similarity index 100% rename from selekt-sqlite3/sqlite3/include/bloomberg/AutoJByteArray.h rename to SQLite3/sqlite3/include/bloomberg/AutoJByteArray.h diff --git a/selekt-sqlite3/sqlite3/include/bloomberg/Throws.h b/SQLite3/sqlite3/include/bloomberg/Throws.h similarity index 100% rename from selekt-sqlite3/sqlite3/include/bloomberg/Throws.h rename to SQLite3/sqlite3/include/bloomberg/Throws.h diff --git a/selekt-sqlite3/sqlite3/include/bloomberg/log.h b/SQLite3/sqlite3/include/bloomberg/log.h similarity index 100% rename from selekt-sqlite3/sqlite3/include/bloomberg/log.h rename to SQLite3/sqlite3/include/bloomberg/log.h diff --git a/selekt-sqlite3/sqlite3_jni.cpp b/SQLite3/sqlite3_jni.cpp similarity index 100% rename from selekt-sqlite3/sqlite3_jni.cpp rename to SQLite3/sqlite3_jni.cpp diff --git a/selekt-sqlite3/src/main/external/sqlcipher b/SQLite3/src/main/external/sqlcipher similarity index 100% rename from selekt-sqlite3/src/main/external/sqlcipher rename to SQLite3/src/main/external/sqlcipher diff --git a/selekt-android-sqlcipher/build.gradle.kts b/selekt-android-sqlcipher/build.gradle.kts index 1724b72bef..a0c768ac99 100644 --- 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 index 798cc02da8..0d6c5ce788 100644 --- a/selekt-android/build.gradle.kts +++ b/selekt-android/build.gradle.kts @@ -88,14 +88,14 @@ koverReport { tasks.register("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("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 index 75e0d36972..dc293a4748 100644 --- a/selekt-java/build.gradle.kts +++ b/selekt-java/build.gradle.kts @@ -85,13 +85,13 @@ tasks.register("integrationTest") { } tasks.register("buildHostSQLite") { - dependsOn(":selekt-sqlite3:buildHost", "copyJniLibs") + dependsOn(":SQLite3:buildHost", "copyJniLibs") } tasks.register("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().configureEach { diff --git a/settings.gradle.kts b/settings.gradle.kts index a4a8677195..353ca9be70 100644 --- 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 {