Skip to content

Commit 3d8cab5

Browse files
committed
Update dependencies
1 parent ea55dc3 commit 3d8cab5

File tree

3 files changed

+24
-21
lines changed

3 files changed

+24
-21
lines changed

app/build.gradle.kts

+21-18
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ android {
2525
minSdk = 23
2626
targetSdk = 35
2727
versionCode = 2
28-
versionName = exec("git describe --tags --long --always")
28+
versionName = exec("git describe --tags --long --always", "1.1.0")
2929
setProperty("archivesBaseName", "$applicationId-$versionName")
3030
}
3131
buildTypes {
@@ -36,7 +36,7 @@ android {
3636
getDefaultProguardFile("proguard-android-optimize.txt"),
3737
"proguard-rules.pro"
3838
)
39-
signingConfig = createSigningConfigFromEnv(signingConfigs)
39+
signingConfig = signingConfigs.createSigningConfigFromEnv()
4040
}
4141
debug {
4242
applicationIdSuffix = ".debug"
@@ -67,11 +67,11 @@ android {
6767
generateLocaleConfig = true
6868
}
6969
compileOptions {
70-
sourceCompatibility = JavaVersion.VERSION_1_8
71-
targetCompatibility = JavaVersion.VERSION_1_8
70+
sourceCompatibility = JavaVersion.VERSION_11
71+
targetCompatibility = JavaVersion.VERSION_11
7272
}
7373
kotlinOptions {
74-
jvmTarget = JavaVersion.VERSION_1_8.toString()
74+
jvmTarget = JavaVersion.VERSION_11.toString()
7575
}
7676
buildFeatures {
7777
buildConfig = true
@@ -101,17 +101,17 @@ tasks.withType<CompileArtProfileTask> { enabled = false }
101101
dependencies {
102102
implementation("net.swiftzer.semver:semver:2.0.0")
103103
implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.14")
104-
implementation("androidx.core:core-ktx:1.13.1")
105-
implementation("androidx.activity:activity-compose:1.9.2")
106-
implementation(platform("androidx.compose:compose-bom:2024.09.01"))
104+
implementation("androidx.core:core-ktx:1.15.0")
105+
implementation("androidx.activity:activity-compose:1.9.3")
106+
implementation(platform("androidx.compose:compose-bom:2024.11.00"))
107107
implementation("androidx.compose.material:material")
108108
implementation("androidx.compose.material:material-icons-extended")
109109
implementation("androidx.compose.ui:ui")
110110
implementation("androidx.compose.ui:ui-tooling-preview")
111111
debugImplementation("androidx.compose.ui:ui-tooling")
112-
implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1")
113-
implementation("androidx.navigation:navigation-compose:2.8.0")
114-
val lifecycleVersion = "2.8.5"
112+
implementation("androidx.constraintlayout:constraintlayout-compose:1.1.0")
113+
implementation("androidx.navigation:navigation-compose:2.8.4")
114+
val lifecycleVersion = "2.8.7"
115115
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
116116
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
117117
}
@@ -125,19 +125,22 @@ configurations {
125125
}
126126
}
127127

128-
fun exec(cmd: String): String = ByteArrayOutputStream().use {
129-
project.exec {
130-
commandLine = cmd.split(" ")
131-
standardOutput = it
128+
fun exec(cmd: String, defaultValue: String = ""): String {
129+
val stdout = ByteArrayOutputStream()
130+
val result = stdout.use {
131+
project.exec {
132+
commandLine = cmd.split(" ")
133+
standardOutput = stdout
134+
}
132135
}
133-
it.toString().trim()
136+
return if (result.exitValue == 0) stdout.toString().trim() else defaultValue
134137
}
135138

136139
fun env(name: String): String? = System.getenv(name)
137140

138141
private var signKeyTempFile: File? = null
139142

140-
fun createSigningConfigFromEnv(signingConfigs: NamedDomainObjectContainer<SigningConfig>): SigningConfig? {
143+
fun NamedDomainObjectContainer<SigningConfig>.createSigningConfigFromEnv(): SigningConfig? {
141144
var signKeyFile: File? = null
142145
env("SIGN_KEY_FILE")?.let {
143146
val file = File(it)
@@ -164,7 +167,7 @@ fun createSigningConfigFromEnv(signingConfigs: NamedDomainObjectContainer<Signin
164167
}
165168
}
166169
signKeyFile ?: return null
167-
return signingConfigs.create("release") {
170+
return create("release") {
168171
storeFile = signKeyFile
169172
storePassword = env("SIGN_KEY_PWD")
170173
keyAlias = env("SIGN_KEY_ALIAS")

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("com.android.application") version "8.6.0" apply false
2+
id("com.android.application") version "8.7.3" apply false
33
kotlin("android") version "2.0.20" apply false
44
kotlin("plugin.compose") version "2.0.20" apply false
55
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Jun 29 13:48:55 GMT 2024
1+
#Sat Dec 07 22:36:59 CST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)