diff --git a/.gitignore b/.gitignore index e86dd35..7b4e38c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ local.properties .idea/ *.iml .DS_Store +# Signing keys must never be committed +*.jks +*.keystore diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7240b99..adfed4d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,11 +1,12 @@ plugins { - id("com.android.application") - id("org.jetbrains.kotlin.plugin.compose") + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.compose) } android { namespace = "cc.skysparkle.sparkledns" - compileSdk = 36 + // The current AndroidX libraries require it + compileSdk = 37 defaultConfig { applicationId = "cc.skysparkle.sparkledns" @@ -71,17 +72,17 @@ android { } dependencies { - implementation(platform("androidx.compose:compose-bom:2025.09.00")) - implementation("androidx.activity:activity-compose:1.10.1") - implementation("androidx.compose.ui:ui") - implementation("androidx.compose.material3:material3") + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.material3) // Already pulled in by Compose at this version; declared because the app uses it directly - implementation("androidx.lifecycle:lifecycle-runtime-compose:2.9.0") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2") - implementation("com.squareup.okhttp3:okhttp:4.12.0") + implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.kotlinx.coroutines.android) + implementation(libs.okhttp) // Debug builds only, never part of a release - debugImplementation("com.squareup.leakcanary:leakcanary-android:2.14") + debugImplementation(libs.leakcanary.android) - testImplementation("junit:junit:4.13.2") + testImplementation(libs.junit) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ba74e68..4c423be 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ - + @@ -21,6 +21,8 @@ @@ -48,9 +50,6 @@ - + + + + + + + + + + + + + + diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml new file mode 100644 index 0000000..61b019d --- /dev/null +++ b/app/src/main/res/xml/locales_config.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/build.gradle.kts b/build.gradle.kts index 4af2a60..5a69fcd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "9.2.1" apply false + alias(libs.plugins.android.application) apply false // Not applied to modules: only pins the Kotlin version used by AGP's built-in Kotlin - id("org.jetbrains.kotlin.android") version "2.4.0" apply false - id("org.jetbrains.kotlin.plugin.compose") version "2.4.0" apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.compose) apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..6ac8c37 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,26 @@ +[versions] +agp = "9.2.1" +kotlin = "2.4.20" +composeBom = "2026.09.00" +activityCompose = "1.13.0" +lifecycleRuntimeCompose = "2.11.0" +kotlinxCoroutines = "1.11.0" +okhttp = "5.4.0" +leakcanary = "2.14" +junit = "4.13.2" + +[libraries] +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeCompose" } +kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" } +okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" } +leakcanary-android = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "leakcanary" } +junit = { group = "junit", name = "junit", version.ref = "junit" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }