Skip to content

Commit 22e22a2

Browse files
committed
build: automate locale config and update dependencies
1 parent ed59829 commit 22e22a2

6 files changed

Lines changed: 12 additions & 41 deletions

File tree

app/build.gradle.kts

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import java.util.Properties
2-
31
plugins {
42
alias(libs.plugins.android.application)
53
alias(libs.plugins.kotlin.compose)
@@ -8,13 +6,6 @@ plugins {
86
alias(libs.plugins.ksp)
97
}
108

11-
val localProperties = Properties().apply {
12-
val localPropertiesFile = rootProject.file("local.properties")
13-
if (localPropertiesFile.exists()) {
14-
localPropertiesFile.inputStream().use { load(it) }
15-
}
16-
}
17-
189
android {
1910
namespace = "jamgmilk.fuwagit"
2011
compileSdk = 37
@@ -29,35 +20,15 @@ android {
2920
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3021
}
3122

32-
signingConfigs {
33-
create("mirukey") {
34-
val path = localProperties.getProperty("RELEASE_STORE_FILE")
35-
if (path != null) {
36-
storeFile = file(path)
37-
storePassword = localProperties.getProperty("RELEASE_STORE_PASSWORD")
38-
keyAlias = localProperties.getProperty("RELEASE_KEY_ALIAS")
39-
keyPassword = localProperties.getProperty("RELEASE_KEY_PASSWORD")
40-
}
41-
}
42-
}
43-
44-
45-
4623
buildTypes {
4724
release {
4825
isMinifyEnabled = true
4926
isShrinkResources = true
50-
signingConfig = signingConfigs.getByName("mirukey")
5127
proguardFiles(
5228
getDefaultProguardFile("proguard-android-optimize.txt"),
5329
"proguard-rules.pro"
5430
)
5531
}
56-
57-
debug {
58-
signingConfig = signingConfigs.getByName("mirukey")
59-
}
60-
6132
}
6233

6334
compileOptions {
@@ -69,6 +40,12 @@ android {
6940
compose = true
7041
buildConfig = true
7142
}
43+
44+
androidResources {
45+
@Suppress("UnstableApiUsage")
46+
generateLocaleConfig = true
47+
}
48+
7249
}
7350

7451
java {

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
android:supportsRtl="true"
2121
android:theme="@style/Theme.FuwaGit"
2222
android:requestLegacyExternalStorage="true"
23-
android:localeConfig="@xml/locales_config"
2423
tools:targetApi="33">
2524
<activity
2625
android:name=".MainActivity"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
unqualifiedResLocale=en

app/src/main/res/xml/locales_config.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@ org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC -Dfile.encoding=UTF-8
1313
org.gradle.parallel=true
1414
org.gradle.caching=true
1515
org.gradle.configuration-cache=true
16-
org.gradle.java.installations.paths=C\:\\AppData\\Scoop\\apps\\openjdk\\current
1716
kotlin.code.style=official

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[versions]
2-
agp = "9.2.0"
2+
agp = "9.2.1"
33
coreKtx = "1.18.0"
44
junit = "4.13.2"
55
junitVersion = "1.3.0"
66
espressoCore = "3.7.0"
77
lifecycleRuntimeKtx = "2.10.0"
88
activityCompose = "1.13.0"
99
kotlin = "2.3.21"
10-
composeBom = "2026.04.01"
10+
composeBom = "2026.05.01"
1111
orgEclipseJgit = "6.8.0.202311291450-r"
1212
documentfile = "1.1.0"
13-
jsch = "2.28.0"
13+
jsch = "2.28.2"
1414
securityCrypto = "1.1.0"
1515
bouncycastle = "1.84"
1616
navigation = "2.9.8"
@@ -20,8 +20,8 @@ datastore = "1.2.1"
2020
appcompat = "1.7.1"
2121
hilt = "2.59.2"
2222
hiltNavigationCompose = "1.3.0"
23-
ksp = "2.3.7"
24-
uiGraphics = "1.11.0"
23+
ksp = "2.3.8"
24+
uiGraphics = "1.11.2"
2525

2626
[libraries]
2727
# Core & Lifecycle

0 commit comments

Comments
 (0)