Skip to content

Commit 5180d73

Browse files
committed
Update dependencies
Update compose-destinations is non-trivial. To use version 2.0+ in the future, we need to follow its migration guide: https://composedestinations.rafaelcosta.xyz/migrating-to-v2/
1 parent b98eaf8 commit 5180d73

File tree

7 files changed

+32
-30
lines changed

7 files changed

+32
-30
lines changed

build.gradle.kts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.android.build.gradle.LibraryExtension
99
plugins {
1010
alias(libs.plugins.agp.lib) apply false
1111
alias(libs.plugins.agp.app) apply false
12+
alias(lspatch.plugins.compose.compiler) apply false
1213
alias(lspatch.plugins.kotlin.android) apply false
1314
}
1415

@@ -18,7 +19,7 @@ buildscript {
1819
mavenCentral()
1920
}
2021
dependencies {
21-
classpath("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r")
22+
classpath("org.eclipse.jgit:org.eclipse.jgit:7.3.0.202506031305-r")
2223
}
2324
}
2425

@@ -51,10 +52,10 @@ val verName by extra("0.7")
5152
val coreVerCode by extra(coreCommitCount)
5253
val coreVerName by extra(coreLatestTag)
5354
val androidMinSdkVersion by extra(28)
54-
val androidTargetSdkVersion by extra(35)
55-
val androidCompileSdkVersion by extra(35)
55+
val androidTargetSdkVersion by extra(36)
56+
val androidCompileSdkVersion by extra(36)
5657
val androidCompileNdkVersion by extra("29.0.13113456")
57-
val androidBuildToolsVersion by extra("35.0.0")
58+
val androidBuildToolsVersion by extra("36.0.0")
5859
val androidSourceCompatibility by extra(JavaVersion.VERSION_21)
5960
val androidTargetCompatibility by extra(JavaVersion.VERSION_21)
6061

gradle/lspatch.versions.toml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
[versions]
2-
room = "2.6.1"
3-
accompanist = "0.27.0"
4-
compose-destinations = "1.9.42-beta"
5-
shizuku = "13.1.2"
6-
hiddenapi-refine = "4.3.0"
7-
hiddenapi-stub = "4.2.0"
8-
compose-bom = "2024.05.00"
9-
kotlin = "1.9.23"
10-
ksp = "1.9.23-1.0.20"
11-
commons-io = "2.13.0"
2+
room = "2.7.2"
3+
accompanist = "0.36.0"
4+
compose-destinations = "1.11.7"
5+
shizuku = "13.1.5"
6+
hiddenapi = "4.4.0"
7+
compose-bom = "2025.07.00"
8+
kotlin = "2.2.0"
9+
ksp = "2.2.0-2.0.2"
10+
commons-io = "2.20.0"
1211
beust-jcommander = "1.82"
13-
google-gson = "2.10.1"
12+
google-gson = "2.13.1"
1413

1514
[plugins]
1615
google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
17-
rikka-tools-refine = { id = "dev.rikka.tools.refine", version.ref = "hiddenapi-refine" }
16+
rikka-tools-refine = { id = "dev.rikka.tools.refine", version.ref = "hiddenapi" }
1817
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
18+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
1919

2020
[libraries]
21-
androidx-customview = "androidx.customview:customview:1.2.0-alpha02"
22-
androidx-customview-poolingcontainer = "androidx.customview:customview-poolingcontainer:1.0.0"
21+
androidx-customview = "androidx.customview:customview:1.2.0"
22+
androidx-customview-poolingcontainer = "androidx.customview:customview-poolingcontainer:1.1.0"
2323

2424
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
2525
androidx-compose-ui = { module = "androidx.compose.ui:ui" }
@@ -28,13 +28,13 @@ androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling
2828
androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
2929
androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
3030

31-
androidx-navigation-compose = "androidx.navigation:navigation-compose:2.6.0"
31+
androidx-navigation-compose = "androidx.navigation:navigation-compose:2.9.3"
3232

33-
androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
33+
androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2"
3434

35-
androidx-activity-compose = "androidx.activity:activity-compose:1.7.2"
35+
androidx-activity-compose = "androidx.activity:activity-compose:1.10.1"
3636

37-
androidx-core-ktx = "androidx.core:core-ktx:1.10.1"
37+
androidx-core-ktx = "androidx.core:core-ktx:1.16.0"
3838

3939
androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
4040
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
@@ -47,9 +47,9 @@ google-accompanist-swiperefresh = { module = "com.google.accompanist:accompanist
4747
rikka-shizuku-api = { module = "dev.rikka.shizuku:api", version.ref = "shizuku" }
4848
rikka-shizuku-provider = { module = "dev.rikka.shizuku:provider", version.ref = "shizuku" }
4949

50-
rikka-refine = { module = "dev.rikka.tools.refine:runtime", version.ref = "hiddenapi-refine" }
50+
rikka-refine = { module = "dev.rikka.tools.refine:runtime", version.ref = "hiddenapi" }
5151

52-
rikka-hidden-stub = { module = "dev.rikka.hidden:stub", version.ref = "hiddenapi-stub" }
52+
rikka-hidden-stub = { module = "dev.rikka.hidden:stub", version.ref = "hiddenapi" }
5353

5454
raamcosta-compose-destinations = { module = "io.github.raamcosta.compose-destinations:core", version.ref = "compose-destinations" }
5555
raamcosta-compose-destinations-ksp = { module = "io.github.raamcosta.compose-destinations:ksp", version.ref = "compose-destinations" }

manager/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ val coreVerName: String by rootProject.extra
99

1010
plugins {
1111
alias(libs.plugins.agp.app)
12+
alias(lspatch.plugins.compose.compiler)
1213
alias(lspatch.plugins.google.devtools.ksp)
1314
alias(lspatch.plugins.rikka.tools.refine)
1415
alias(lspatch.plugins.kotlin.android)

manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ fun NewPatchScreen(
129129
}
130130

131131
ACTION_APPLIST -> {
132-
navigator.navigate(SelectAppsScreenDestination(false))
132+
navigator.navigate(SelectAppsScreenDestination(false, null))
133133
viewModel.dispatch(ViewAction.DoneInit)
134134
}
135135

manager/src/main/java/org/lsposed/lspatch/ui/page/SelectAppsScreen.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ sealed class SelectAppsResult : Parcelable {
4444
fun SelectAppsScreen(
4545
navigator: ResultBackNavigator<SelectAppsResult>,
4646
multiSelect: Boolean,
47-
initialSelected: ArrayList<String>? = null
47+
initialSelected: ArrayList<String>?,
4848
) {
4949
val viewModel = viewModel<SelectAppsViewModel>()
5050

@@ -126,7 +126,7 @@ private fun SingleSelect(onSelect: (AppInfo) -> Unit) {
126126
) {
127127
AppItem(
128128
modifier = Modifier
129-
.animateItemPlacement(spring(stiffness = Spring.StiffnessLow))
129+
.animateItem(spring(stiffness = Spring.StiffnessLow))
130130
.clickable { onSelect(it) },
131131
icon = LSPPackageManager.getIcon(it),
132132
label = it.label,
@@ -148,7 +148,7 @@ private fun MultiSelect() {
148148
val checked = viewModel.multiSelected.contains(it)
149149
AppItem(
150150
modifier = Modifier
151-
.animateItemPlacement(spring(stiffness = Spring.StiffnessLow))
151+
.animateItem(spring(stiffness = Spring.StiffnessLow))
152152
.clickable {
153153
if (checked) viewModel.multiSelected.remove(it)
154154
else viewModel.multiSelected.add(it)

patch-loader/src/main/jni/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project(lspatch)
2-
cmake_minimum_required(VERSION 3.4.1)
2+
cmake_minimum_required(VERSION 3.28)
33

44
set(CMAKE_CXX_STANDARD 23)
55
add_subdirectory(${CORE_ROOT} core)

0 commit comments

Comments
 (0)