diff --git a/build.gradle.kts b/build.gradle.kts index a4ff58e..bb666f9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,6 +9,7 @@ import com.android.build.gradle.LibraryExtension plugins { alias(libs.plugins.agp.lib) apply false alias(libs.plugins.agp.app) apply false + alias(lspatch.plugins.compose.compiler) apply false alias(lspatch.plugins.kotlin.android) apply false } @@ -18,7 +19,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r") + classpath("org.eclipse.jgit:org.eclipse.jgit:7.3.0.202506031305-r") } } @@ -51,10 +52,10 @@ val verName by extra("0.7") val coreVerCode by extra(coreCommitCount) val coreVerName by extra(coreLatestTag) val androidMinSdkVersion by extra(28) -val androidTargetSdkVersion by extra(35) -val androidCompileSdkVersion by extra(35) +val androidTargetSdkVersion by extra(36) +val androidCompileSdkVersion by extra(36) val androidCompileNdkVersion by extra("29.0.13113456") -val androidBuildToolsVersion by extra("35.0.0") +val androidBuildToolsVersion by extra("36.0.0") val androidSourceCompatibility by extra(JavaVersion.VERSION_21) val androidTargetCompatibility by extra(JavaVersion.VERSION_21) diff --git a/core b/core index 90d3712..e75b600 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 90d3712c6e99199ae9797de15710dd12c4b107e4 +Subproject commit e75b6007b40dd98047b49807d8e9686d0b7fbc38 diff --git a/gradle/lspatch.versions.toml b/gradle/lspatch.versions.toml index f1fbcd9..6df485d 100644 --- a/gradle/lspatch.versions.toml +++ b/gradle/lspatch.versions.toml @@ -1,25 +1,25 @@ [versions] -room = "2.6.1" -accompanist = "0.27.0" -compose-destinations = "1.9.42-beta" -shizuku = "13.1.2" -hiddenapi-refine = "4.3.0" -hiddenapi-stub = "4.2.0" -compose-bom = "2024.05.00" -kotlin = "1.9.23" -ksp = "1.9.23-1.0.20" -commons-io = "2.13.0" +room = "2.7.2" +accompanist = "0.36.0" +compose-destinations = "1.11.7" +shizuku = "13.1.5" +hiddenapi = "4.4.0" +compose-bom = "2025.07.00" +kotlin = "2.2.0" +ksp = "2.2.0-2.0.2" +commons-io = "2.20.0" beust-jcommander = "1.82" -google-gson = "2.10.1" +google-gson = "2.13.1" [plugins] google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } -rikka-tools-refine = { id = "dev.rikka.tools.refine", version.ref = "hiddenapi-refine" } +rikka-tools-refine = { id = "dev.rikka.tools.refine", version.ref = "hiddenapi" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } [libraries] -androidx-customview = "androidx.customview:customview:1.2.0-alpha02" -androidx-customview-poolingcontainer = "androidx.customview:customview-poolingcontainer:1.0.0" +androidx-customview = "androidx.customview:customview:1.2.0" +androidx-customview-poolingcontainer = "androidx.customview:customview-poolingcontainer:1.1.0" androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" } androidx-compose-ui = { module = "androidx.compose.ui:ui" } @@ -28,13 +28,13 @@ androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } -androidx-navigation-compose = "androidx.navigation:navigation-compose:2.6.0" +androidx-navigation-compose = "androidx.navigation:navigation-compose:2.9.3" -androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1" +androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2" -androidx-activity-compose = "androidx.activity:activity-compose:1.7.2" +androidx-activity-compose = "androidx.activity:activity-compose:1.10.1" -androidx-core-ktx = "androidx.core:core-ktx:1.10.1" +androidx-core-ktx = "androidx.core:core-ktx:1.16.0" androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } @@ -47,9 +47,9 @@ google-accompanist-swiperefresh = { module = "com.google.accompanist:accompanist rikka-shizuku-api = { module = "dev.rikka.shizuku:api", version.ref = "shizuku" } rikka-shizuku-provider = { module = "dev.rikka.shizuku:provider", version.ref = "shizuku" } -rikka-refine = { module = "dev.rikka.tools.refine:runtime", version.ref = "hiddenapi-refine" } +rikka-refine = { module = "dev.rikka.tools.refine:runtime", version.ref = "hiddenapi" } -rikka-hidden-stub = { module = "dev.rikka.hidden:stub", version.ref = "hiddenapi-stub" } +rikka-hidden-stub = { module = "dev.rikka.hidden:stub", version.ref = "hiddenapi" } raamcosta-compose-destinations = { module = "io.github.raamcosta.compose-destinations:core", version.ref = "compose-destinations" } raamcosta-compose-destinations-ksp = { module = "io.github.raamcosta.compose-destinations:ksp", version.ref = "compose-destinations" } diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts index a7cb86c..5b8b86c 100644 --- a/manager/build.gradle.kts +++ b/manager/build.gradle.kts @@ -9,6 +9,7 @@ val coreVerName: String by rootProject.extra plugins { alias(libs.plugins.agp.app) + alias(lspatch.plugins.compose.compiler) alias(lspatch.plugins.google.devtools.ksp) alias(lspatch.plugins.rikka.tools.refine) alias(lspatch.plugins.kotlin.android) diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt b/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt index a1dc27e..d298fe1 100644 --- a/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt +++ b/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt @@ -129,7 +129,7 @@ fun NewPatchScreen( } ACTION_APPLIST -> { - navigator.navigate(SelectAppsScreenDestination(false)) + navigator.navigate(SelectAppsScreenDestination(false, null)) viewModel.dispatch(ViewAction.DoneInit) } diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/page/SelectAppsScreen.kt b/manager/src/main/java/org/lsposed/lspatch/ui/page/SelectAppsScreen.kt index 25721bb..108de1d 100644 --- a/manager/src/main/java/org/lsposed/lspatch/ui/page/SelectAppsScreen.kt +++ b/manager/src/main/java/org/lsposed/lspatch/ui/page/SelectAppsScreen.kt @@ -44,7 +44,7 @@ sealed class SelectAppsResult : Parcelable { fun SelectAppsScreen( navigator: ResultBackNavigator, multiSelect: Boolean, - initialSelected: ArrayList? = null + initialSelected: ArrayList?, ) { val viewModel = viewModel() @@ -126,7 +126,7 @@ private fun SingleSelect(onSelect: (AppInfo) -> Unit) { ) { AppItem( modifier = Modifier - .animateItemPlacement(spring(stiffness = Spring.StiffnessLow)) + .animateItem(spring(stiffness = Spring.StiffnessLow)) .clickable { onSelect(it) }, icon = LSPPackageManager.getIcon(it), label = it.label, @@ -148,7 +148,7 @@ private fun MultiSelect() { val checked = viewModel.multiSelected.contains(it) AppItem( modifier = Modifier - .animateItemPlacement(spring(stiffness = Spring.StiffnessLow)) + .animateItem(spring(stiffness = Spring.StiffnessLow)) .clickable { if (checked) viewModel.multiSelected.remove(it) else viewModel.multiSelected.add(it) diff --git a/patch-loader/src/main/jni/CMakeLists.txt b/patch-loader/src/main/jni/CMakeLists.txt index e56e88f..974fdf3 100644 --- a/patch-loader/src/main/jni/CMakeLists.txt +++ b/patch-loader/src/main/jni/CMakeLists.txt @@ -1,5 +1,5 @@ project(lspatch) -cmake_minimum_required(VERSION 3.4.1) +cmake_minimum_required(VERSION 3.28) set(CMAKE_CXX_STANDARD 23) add_subdirectory(${CORE_ROOT} core)