Skip to content
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
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
[submodule "app/src/main/jni/core"]
path = app/src/main/jni/core
url = https://github.com/brainwallet-co/core.git
[submodule "modules/games"]
path = modules/games
url = https://github.com/gruntsoftware/android-games.git
update = none
7 changes: 7 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,13 @@ dependencies {
}
}

val gamesModule = findProject(":modules:games:content")
if (gamesModule != null) {
implementation(gamesModule)
} else {
logger.lifecycle("⚠️ Submodule ':modules:games:content' not found β€” skipping dependency")
}

implementation("androidx.webkit:webkit:1.9.0")
implementation(libs.androidx.core)
implementation(libs.androidx.appcompat)
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.jetbrains.kotlin.android) apply false
alias(libs.plugins.jetbrains.kotlin.compose) apply false
alias(libs.plugins.jetbrains.kotlin.kapt) apply false
Expand Down
3 changes: 2 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,11 @@ squareup-okhttp = ["squareup-okhttp", "squareup-okhttp-logging-interceptor"]

[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
jetbrains-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version = "2.1.0" }
jetbrains-kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
google-services = { id = "com.google.gms.google-services", version = "4.4.2" }
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.2" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
1 change: 1 addition & 0 deletions modules/games
Submodule games added at a5f408
18 changes: 18 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,33 @@ pluginManagement {
gradlePluginPortal()
}
}

dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}

versionCatalogs {
val gamesToml = file("modules/games/gradle/libs.versions.toml")
if (gamesToml.exists()) {
create("games") {
from(files(gamesToml))
}
} else {
logger.lifecycle("⚠️ Submodule catalog 'games' not loaded β€” file not found: $gamesToml")
}
}
}

rootProject.name = "Brainwallet Android"
include(":app")
include(":install_time_asset_pack")

val gamesDir = file("modules/games/content")
if (gamesDir.exists()) {
include(":modules:games:content")
} else {
logger.lifecycle("⚠️ Submodule ':modules:games:content' not included β€” folder not found: $gamesDir")
}