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.

Sign up for GitHub

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

Jump to bottom

Jsword as a git submodule #2985

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Jsword as a git submodule #2985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2dd478
Revert "Revert "Add jsword as a submodule""
tuomas2 Nov 2, 2023
81acab2
Revert "Revert "Remove references to jsword version""
tuomas2 Nov 2, 2023
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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "jsword"]
path = jsword
url = [email protected]:AndBible/jsword.git
3 changes: 1 addition & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@ androidComponents {
dependencies {
val commonsTextVersion: String by rootProject.extra
val jdomVersion: String by rootProject.extra
val jswordVersion: String by rootProject.extra
val kotlinVersion: String by rootProject.extra
val coroutinesVersion: String by rootProject.extra
val kotlinxSerializationVersion: String by rootProject.extra
Expand Down Expand Up @@ -391,7 +390,7 @@ dependencies {
implementation("org.apache.commons:commons-lang3:3.12.0") // make sure this is the same version that commons-text depends on
implementation("org.apache.commons:commons-text:$commonsTextVersion")

implementation("com.github.AndBible:jsword:$jswordVersion") {
implementation(project(":jsword")) {
exclude("org.apache.httpcomponents")
}

Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ buildscript {
val jvmToolChainVersion by extra(17)
val coreKtxVersion by extra("1.12.0")
val sqliteAndroidVersion by extra("3.42.0")
val jswordVersion by extra("2.4.04")


repositories {
Expand Down
5 changes: 3 additions & 2 deletions db/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ dependencies {
val coroutinesVersion: String by rootProject.extra
val commonsTextVersion: String by rootProject.extra
val jdomVersion: String by rootProject.extra
val jswordVersion: String by rootProject.extra
val kotlinxSerializationVersion: String by rootProject.extra
val roomVersion: String by rootProject.extra
val coreKtxVersion: String by rootProject.extra
Expand All @@ -78,9 +77,11 @@ dependencies {
implementation("androidx.room:room-ktx:$roomVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${coroutinesVersion}")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationVersion")
implementation("com.github.AndBible:jsword:$jswordVersion") {

implementation(project(":jsword")) {
exclude("org.apache.httpcomponents")
}

implementation("org.jdom:jdom2:$jdomVersion")
implementation("org.apache.commons:commons-text:$commonsTextVersion")
implementation("androidx.core:core-ktx:$coreKtxVersion")
Expand Down
1 change: 1 addition & 0 deletions jsword
Open in desktop
Submodule jsword added at dd3936
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
* If not, see http://www.gnu.org/licenses/.
*/

include(":app", ":db")
include(":app", ":db", ":jsword")
Loading