Skip to content

Commit 0f7ab69

Browse files
committed
chore: update dependencies
1 parent ad5c103 commit 0f7ab69

File tree

12 files changed

+38
-43
lines changed

12 files changed

+38
-43
lines changed

app/build.gradle.kts

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ plugins {
66
alias(libs.plugins.android.application)
77
alias(libs.plugins.compose.compiler)
88
alias(libs.plugins.hiddenApi.refine)
9-
alias(libs.plugins.kotlin.android)
109
alias(libs.plugins.kotlin.parcelize)
1110
alias(libs.plugins.kotlin.serialization)
1211
}
@@ -145,22 +144,29 @@ android {
145144
}
146145
}
147146

147+
composeCompiler {
148+
// Temporary workaround for https://youtrack.jetbrains.com/projects/KT/issues/KT-83266/
149+
// Remove once updated to Kotlin 2.3.10
150+
includeComposeMappingFile.set(false)
151+
}
152+
148153
kotlin {
149-
sourceSets.all {
150-
languageSettings.enableLanguageFeature("ExplicitBackingFields")
151-
}
152154
compilerOptions {
153155
val reportsDir = layout.buildDirectory.asFile.get()
154156
.resolve("reports").absolutePath
155157

156158
jvmTarget = JvmTarget.JVM_21
159+
optIn.addAll(
160+
"androidx.compose.animation.ExperimentalAnimationApi",
161+
"androidx.compose.foundation.ExperimentalFoundationApi",
162+
"androidx.compose.foundation.layout.ExperimentalLayoutApi",
163+
"androidx.compose.material3.ExperimentalMaterial3Api",
164+
"kotlin.time.ExperimentalTime",
165+
"kotlinx.serialization.ExperimentalSerializationApi",
166+
)
157167
freeCompilerArgs.addAll(
158-
"-opt-in=kotlin.time.ExperimentalTime",
159-
"-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
160-
"-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
161-
"-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
162-
"-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
163168
"-P", "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=${reportsDir}",
169+
"-XXLanguage:+ExplicitBackingFields",
164170
"-XXLanguage:+PropertyParamAnnotationDefaultTargetMode", // @StringRes in field parameters of a class warning
165171
)
166172
}

app/src/main/kotlin/com/aliucord/manager/MainActivity.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import com.aliucord.manager.util.*
3838
import com.github.diamondminer88.zip.ZipReader
3939
import kotlinx.coroutines.CoroutineScope
4040
import kotlinx.coroutines.Dispatchers
41-
import kotlinx.serialization.ExperimentalSerializationApi
4241
import kotlinx.serialization.json.Json
4342
import kotlinx.serialization.json.decodeFromStream
4443
import org.koin.android.ext.android.inject
@@ -191,7 +190,6 @@ class MainActivity : ComponentActivity() {
191190
val metadataFile = ZipReader(applicationInfo.publicSourceDir)
192191
.use { it.openEntry("aliucord.json")?.read() }
193192

194-
@OptIn(ExperimentalSerializationApi::class)
195193
metadataFile?.let { json.decodeFromStream<InstallMetadata>(it.inputStream()) }
196194
} catch (t: Throwable) {
197195
Log.w(BuildConfig.TAG, "Failed to parse Aliucord install metadata from package $packageName", t)

app/src/main/kotlin/com/aliucord/manager/manager/InstallLogManager.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import androidx.core.content.getSystemService
1010
import com.aliucord.manager.BuildConfig
1111
import com.aliucord.manager.ui.screens.patchopts.PatchOptions
1212
import com.aliucord.manager.util.*
13-
import kotlinx.serialization.ExperimentalSerializationApi
1413
import kotlinx.serialization.Serializable
1514
import kotlinx.serialization.json.Json
1615
import kotlinx.serialization.json.decodeFromStream
@@ -53,7 +52,6 @@ class InstallLogManager(
5352
if (!path.exists()) return null
5453

5554
return try {
56-
@OptIn(ExperimentalSerializationApi::class)
5755
json.decodeFromStream(path.inputStream())
5856
} catch (t: Throwable) {
5957
Log.e(BuildConfig.TAG, "Failed to open install log $id", t)

app/src/main/kotlin/com/aliucord/manager/ui/previews/screens/home/HomeScreenLoadedPreview.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import com.aliucord.manager.ui.screens.home.*
1111
import com.aliucord.manager.ui.screens.home.components.HomeAppBar
1212
import com.aliucord.manager.ui.theme.ManagerTheme
1313
import com.aliucord.manager.ui.util.DiscordVersion
14-
import io.ktor.util.decodeBase64Bytes
1514
import kotlinx.collections.immutable.persistentListOf
15+
import kotlin.io.encoding.Base64
1616

1717
// This preview has animations that cannot be properly viewed from an IDE preview
1818

@@ -42,9 +42,9 @@ private fun HomeScreenLoadedPreview(
4242

4343
private class HomeScreenParametersProvider : PreviewParameterProvider<InstallsState.Fetched> {
4444
private val stableVersion = DiscordVersion.Existing(DiscordVersion.Type.STABLE, "126.21", 126021)
45-
private val aliucordIconBytes =
45+
private val aliucordIconBytes = Base64.decode(
4646
"/9j/4AAQSkZJRgABAQAAAQABAAD/4gHYSUNDX1BST0ZJTEUAAQEAAAHIAAAAAAQwAABtbnRyUkdCIFhZWiAH4AABAAEAAAAAAABhY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA9tYAAQAAAADTLQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlkZXNjAAAA8AAAACRyWFlaAAABFAAAABRnWFlaAAABKAAAABRiWFlaAAABPAAAABR3dHB0AAABUAAAABRyVFJDAAABZAAAAChnVFJDAAABZAAAAChiVFJDAAABZAAAAChjcHJ0AAABjAAAADxtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAAgAAAAcAHMAUgBHAEJYWVogAAAAAAAAb6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9YWVogAAAAAAAA9tYAAQAAAADTLXBhcmEAAAAAAAQAAAACZmYAAPKnAAANWQAAE9AAAApbAAAAAAAAAABtbHVjAAAAAAAAAAEAAAAMZW5VUwAAACAAAAAcAEcAbwBvAGcAbABlACAASQBuAGMALgAgADIAMAAxADb/2wBDAKBueIx4ZKCMgoy0qqC+8P//8Nzc8P//////////////////////////////////////////////////////////2wBDAaq0tPDS8P//////////////////////////////////////////////////////////////////////////////wAARCAC9AL0DASIAAhEBAxEB/8QAFwABAQEBAAAAAAAAAAAAAAAAAAIDAf/EACIQAQEAAgEFAAIDAAAAAAAAAAABAhEhAxIxQVETMiJhcf/EABcBAQEBAQAAAAAAAAAAAAAAAAABAgP/xAAZEQEBAQEBAQAAAAAAAAAAAAAAARECEjH/2gAMAwEAAhEDEQA/AMsce7/Gkkngk1NOoxboAIAAAAAAAAAAAAAAAAAAm4ys7NXVbJyx2LKoAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZLfRcbJug4AABJugDtxs9OAAAAAAAAAAAAAA7jN0HccN81cxk9OityBZuaAVP459OyKBMifxwxw1dqAyBrYCpuEvhFmq1TnNwZsZgIyAAAAAAAANcJqM8ZutRrkAVoAAAAAAAAABnnNVLTObjNGKACAAAAAAL6c9rcxmsY6rcALdTYrlyk8kzlZeRGPTYThdzSlbC2TyMsruiW4vvimK+nedIkqwFaGN4rZnnP5DPSQEZAAAAAJ5BtPACug5n+tdAYi8sL6cmFqOeO9P2sk1NCtwYtk5Yb5gljNWH7Odt+NMce2IkjoCtiOp6WjqeIJfiAEYAAAACeYANgllnAroA5lbJxAdEzOe+FblDQAAAAcuUntyZW3iCaoAUT1PEUjOy8CX4gBGAAAAAACWzw0mf1mBLjYZS2eFTqfVa9O9TWv7Zu27u3EZtd7r9O/L64Brvdfrm79AHZ55asVY56mhZWjlykRc7Ui3pWWdqQGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHMbuOsZbLw0xy2LYoAQAAAAAAAAAAAAAAAAAARnlzqGWdnEQNSP/2Q=="
47-
.decodeBase64Bytes()
47+
)
4848
private val aliucordIcon = BitmapFactory
4949
.decodeByteArray(aliucordIconBytes, 0, aliucordIconBytes.size)
5050
.asImageBitmap()

app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeModel.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import com.github.diamondminer88.zip.ZipReader
3030
import kotlinx.coroutines.*
3131
import kotlinx.coroutines.sync.Mutex
3232
import kotlinx.coroutines.sync.withLock
33-
import kotlinx.serialization.ExperimentalSerializationApi
3433
import kotlinx.serialization.json.Json
3534
import kotlinx.serialization.json.decodeFromStream
3635

@@ -108,7 +107,6 @@ class HomeModel(
108107
val metadataFile = ZipReader(applicationInfo.publicSourceDir)
109108
.use { it.openEntry("aliucord.json")?.read() }
110109

111-
@OptIn(ExperimentalSerializationApi::class)
112110
metadataFile?.let { json.decodeFromStream<InstallMetadata>(it.inputStream()) }
113111
} catch (t: Throwable) {
114112
Log.w(BuildConfig.TAG, "Failed to parse Aliucord install metadata from package $packageName", t)
@@ -243,7 +241,6 @@ class HomeModel(
243241
val metadataFile = ZipReader(apkPath).use { it.openEntry("aliucord.json")?.read() }
244242
?: return false
245243

246-
@OptIn(ExperimentalSerializationApi::class)
247244
json.decodeFromStream<InstallMetadata>(metadataFile.inputStream())
248245
} catch (t: Throwable) {
249246
// If it failed to parse, then it's outdated

app/src/main/kotlin/com/aliucord/manager/ui/screens/iconopts/IconOptionsScreen.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,6 @@ private fun CustomColorOptions(
261261
color: HsvColor,
262262
setColor: (HsvColor) -> Unit,
263263
) {
264-
val color by rememberUpdatedState(color)
265-
266264
// This color is separated from the live color and intentionally lags behind while the RGBTextField is being edited.
267265
// When this changes, then the text inside the RGBTextField is reset to the fully formatted color.
268266
// As such, this only happens when the color is changed via the other color pickers.
@@ -278,9 +276,9 @@ private fun CustomColorOptions(
278276
modifier = Modifier.fillMaxWidth(),
279277
) {
280278
CircularColorPicker(
281-
hue = color.hue,
282-
saturation = color.saturation,
283-
value = color.value,
279+
hue = { color.hue },
280+
saturation = { color.saturation },
281+
value = { color.value },
284282
onColorChange = { hue, saturation ->
285283
color.copy(hue = hue, saturation = saturation).let {
286284
setColor(it)

app/src/main/kotlin/com/aliucord/manager/ui/screens/plugins/PluginsModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import kotlinx.coroutines.flow.*
2020
import kotlinx.coroutines.plus
2121
import kotlinx.coroutines.sync.Mutex
2222
import kotlinx.coroutines.sync.withLock
23-
import kotlinx.serialization.*
23+
import kotlinx.serialization.SerialName
24+
import kotlinx.serialization.Serializable
2425
import kotlinx.serialization.json.*
2526
import java.io.File
2627
import kotlin.time.Duration
2728

28-
@OptIn(ExperimentalSerializationApi::class)
2929
class PluginsModel(
3030
private val context: Application,
3131
private val paths: PathManager,
@@ -43,7 +43,7 @@ class PluginsModel(
4343
private set
4444

4545
val searchText: StateFlow<String>
46-
private field = MutableStateFlow("")
46+
field = MutableStateFlow("")
4747

4848
var pluginsSafeMode = MutableStateFlow(false)
4949
private set

app/src/main/kotlin/com/aliucord/manager/ui/widgets/updater/UpdaterViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ class UpdaterViewModel(
3434
var targetVersion by mutableStateOf<String?>(null)
3535
private set
3636
val downloadProgress: StateFlow<Float?>
37-
private field = MutableStateFlow(null)
37+
field = MutableStateFlow(null)
3838
val isWorking: StateFlow<Boolean>
39-
private field = MutableStateFlow(false)
39+
field = MutableStateFlow(false)
4040

4141
private var targetApkUrl: String? = null
4242

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
alias(libs.plugins.android.application) apply false
3-
alias(libs.plugins.kotlin.android) apply false
43
alias(libs.plugins.kotlin.parcelize) apply false
54
alias(libs.plugins.kotlin.serialization) apply false
65
}

gradle/libs.versions.toml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
[versions]
22
accompanist = "0.37.3"
3-
agp = "8.13.0"
4-
androidx-activity = "1.11.0"
3+
agp = "9.0.0"
4+
androidx-activity = "1.12.2"
55
androidx-core = "1.17.0"
6-
androidx-lifecycle = "2.9.4"
7-
androidx-splashscreen = "1.0.1"
8-
apksig = "8.13.0"
6+
androidx-lifecycle = "2.10.0"
7+
androidx-splashscreen = "1.2.0"
8+
apksig = "9.0.0"
99
axml = "1.0.1"
1010
binary-resources = "2.1.0"
11-
bouncycastle = "1.82"
11+
bouncycastle = "1.83"
1212
coil = "3.3.0"
13-
compose = "1.9.4"
13+
compose = "1.10.1"
1414
compose-material3 = "1.4.0"
15-
compose-pipette = "1.0.1"
15+
compose-pipette = "2.0.0-beta03"
1616
desugaring = "2.1.5"
1717
dhizuku = "2.5.4"
1818
diff = "4.16"
1919
hiddenApi-bypass = "6.1"
2020
hiddenApi-refine = "4.4.0"
2121
hiddenApi-stub = "4.4.0"
2222
koin = "4.1.1"
23-
kotlin = "2.2.21"
23+
kotlin = "2.3.0"
2424
kotlinx-immutable = "0.4.0"
25-
kotlinx-serialization = "1.9.0"
26-
ktor = "3.3.1"
25+
kotlinx-serialization = "1.10.0"
26+
ktor = "3.4.0"
2727
libsu = "6.0.0"
2828
microg = "0.3.6.244735"
2929
shimmer = "1.3.3"
@@ -154,7 +154,6 @@ voyager = [
154154
[plugins]
155155
android-application = { id = "com.android.application", version.ref = "agp" }
156156
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
157-
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
158157
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
159158
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
160159
hiddenApi-refine = { id = "dev.rikka.tools.refine", version.ref = "hiddenApi-refine" }

0 commit comments

Comments
 (0)