Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename SQLite3 subproject, because it does not publish an artifact. #505

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publication.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions selekt-android-sqlcipher/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ android {
}
externalNativeBuild {
cmake {
path("$rootDir/selekt-sqlite3/CMakeLists.txt")
path("$rootDir/SQLite3/CMakeLists.txt")
version = Versions.CMAKE.version
}
}
Expand All @@ -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")
}
}

Expand Down
4 changes: 2 additions & 2 deletions selekt-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
6 changes: 3 additions & 3 deletions selekt-java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading