Skip to content

Commit 9361c9b

Browse files
committed
Update dependencies
1 parent 3e38c2f commit 9361c9b

File tree

6 files changed

+16
-18
lines changed

6 files changed

+16
-18
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
.externalNativeBuild
1010
.cxx
1111
local.properties
12+
/.kotlin

app/build.gradle.kts

+8-10
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ plugins {
1818

1919
android {
2020
namespace = "org.fcitx.fcitx5.android.updater"
21-
compileSdk = 34
22-
buildToolsVersion = "34.0.0"
21+
compileSdk = 35
22+
buildToolsVersion = "35.0.0"
2323
defaultConfig {
2424
applicationId = "org.fcitx.fcitx5.android.updater"
2525
minSdk = 23
@@ -77,9 +77,6 @@ android {
7777
buildConfig = true
7878
compose = true
7979
}
80-
composeCompiler {
81-
enableStrongSkippingMode = true
82-
}
8380
}
8481

8582
// remove META-INF/com/android/build/gradle/app-metadata.properties
@@ -105,16 +102,16 @@ dependencies {
105102
implementation("net.swiftzer.semver:semver:2.0.0")
106103
implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.14")
107104
implementation("androidx.core:core-ktx:1.13.1")
108-
implementation("androidx.activity:activity-compose:1.9.1")
109-
implementation(platform("androidx.compose:compose-bom:2024.06.00"))
105+
implementation("androidx.activity:activity-compose:1.9.2")
106+
implementation(platform("androidx.compose:compose-bom:2024.09.01"))
110107
implementation("androidx.compose.material:material")
111108
implementation("androidx.compose.material:material-icons-extended")
112109
implementation("androidx.compose.ui:ui")
113110
implementation("androidx.compose.ui:ui-tooling-preview")
114111
debugImplementation("androidx.compose.ui:ui-tooling")
115112
implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1")
116-
implementation("androidx.navigation:navigation-compose:2.7.7")
117-
val lifecycleVersion = "2.8.4"
113+
implementation("androidx.navigation:navigation-compose:2.8.0")
114+
val lifecycleVersion = "2.8.5"
118115
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
119116
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
120117
}
@@ -123,6 +120,8 @@ configurations {
123120
all {
124121
// remove Baseline Profile Installer or whatever it is...
125122
exclude(group = "androidx.profileinstaller", module = "profileinstaller")
123+
// remove libandroidx.graphics.path.so
124+
exclude(group = "androidx.graphics", module = "graphics-path")
126125
}
127126
}
128127

@@ -165,7 +164,6 @@ fun createSigningConfigFromEnv(signingConfigs: NamedDomainObjectContainer<Signin
165164
}
166165
}
167166
signKeyFile ?: return null
168-
println("signKeyFile: $signKeyFile")
169167
return signingConfigs.create("release") {
170168
storeFile = signKeyFile
171169
storePassword = env("SIGN_KEY_PWD")

app/src/main/java/org/fcitx/fcitx5/android/updater/PackageUtils.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ object PackageUtils {
1414

1515
private fun packageInfoToVersion(info: PackageInfo) =
1616
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
17-
info.versionName to info.longVersionCode
17+
(info.versionName ?: "") to info.longVersionCode
1818
} else {
1919
@Suppress("DEPRECATION")
20-
info.versionName to info.versionCode.toLong()
20+
(info.versionName ?: "") to info.versionCode.toLong()
2121
}
2222

2323
fun getVersionInfo(context: Context, apkFilePath: String) =

app/src/main/java/org/fcitx/fcitx5/android/updater/ui/components/VersionCard.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.compose.ui.unit.dp
1515
import androidx.constraintlayout.compose.ConstraintLayout
1616
import androidx.constraintlayout.compose.Dimension
1717
import org.fcitx.fcitx5.android.updater.model.VersionUi
18+
import java.util.Locale
1819

1920
@Composable
2021
fun VersionCard(version: VersionUi) {
@@ -35,7 +36,7 @@ fun VersionCard(version: VersionUi) {
3536
)
3637
CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
3738
Text(
38-
text = String.format("%.2f MiB", version.size),
39+
text = String.format(Locale.ROOT, "%.2f MiB", version.size),
3940
style = MaterialTheme.typography.body2,
4041
modifier = Modifier
4142
.padding(bottom = 8.dp)

app/src/main/java/org/fcitx/fcitx5/android/updater/ui/components/VersionCardMenu.kt

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import androidx.compose.ui.Modifier
2424
import androidx.compose.ui.platform.LocalClipboardManager
2525
import androidx.compose.ui.res.stringResource
2626
import androidx.compose.ui.text.AnnotatedString
27-
import androidx.compose.ui.unit.DpOffset
2827
import androidx.compose.ui.unit.dp
2928
import org.fcitx.fcitx5.android.updater.R
3029
import org.fcitx.fcitx5.android.updater.model.RemoteVersionUiState
@@ -71,7 +70,6 @@ fun VersionCardMenuIcon(
7170
expanded = menuExpanded,
7271
onDismissRequest = dismissMenu,
7372
modifier = Modifier.defaultMinSize(minWidth = 180.dp),
74-
offset = DpOffset((-8).dp, (-56).dp),
7573
content = { content(dismissMenu) }
7674
)
7775
}

build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id("com.android.application") version "8.5.1" apply false
3-
kotlin("android") version "2.0.0" apply false
4-
kotlin("plugin.compose") version "2.0.0" apply false
2+
id("com.android.application") version "8.6.0" apply false
3+
kotlin("android") version "2.0.20" apply false
4+
kotlin("plugin.compose") version "2.0.20" apply false
55
}
66

77
tasks.register("clean", Delete::class) {

0 commit comments

Comments
 (0)