From 9ef9f5963e73b83a62152fb5c5281f54306fc41c Mon Sep 17 00:00:00 2001 From: LoveSy Date: Mon, 8 Jul 2024 22:14:10 +0800 Subject: [PATCH 1/3] Upgrade gradle --- manager/build.gradle.kts | 2 +- manager/gradle/wrapper/gradle-wrapper.properties | 2 +- manager/gradlew | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts index 0e503df3b636..6148df4d25cb 100644 --- a/manager/build.gradle.kts +++ b/manager/build.gradle.kts @@ -28,7 +28,7 @@ cmaker { } buildTypes { if (it.name == "release") { - arguments += "-DDEBUG_SYMBOLS_PATH=${buildDir.absolutePath}/symbols" + arguments += "-DDEBUG_SYMBOLS_PATH=${layout.buildDirectory.asFile.get().absolutePath}/symbols" } } } diff --git a/manager/gradle/wrapper/gradle-wrapper.properties b/manager/gradle/wrapper/gradle-wrapper.properties index b82aa23a4f05..a4413138c96c 100644 --- a/manager/gradle/wrapper/gradle-wrapper.properties +++ b/manager/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/manager/gradlew b/manager/gradlew index 4b6a9cfc46fa..b740cf13397a 100755 --- a/manager/gradlew +++ b/manager/gradlew @@ -1,4 +1,5 @@ #!/bin/sh + # # Copyright © 2015-2021 the original authors. # @@ -54,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. From 83d81959e21a2592f3a00774ddaab78328417741 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Mon, 8 Jul 2024 22:33:03 +0800 Subject: [PATCH 2/3] Upgrade ndk --- manager/app/build.gradle.kts | 3 +++ manager/app/src/main/cpp/CMakeLists.txt | 3 +++ manager/build.gradle.kts | 12 +++--------- manager/gradle/libs.versions.toml | 4 +++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/manager/app/build.gradle.kts b/manager/app/build.gradle.kts index 1c85d8af7e8a..7cfb9959f742 100644 --- a/manager/app/build.gradle.kts +++ b/manager/app/build.gradle.kts @@ -34,6 +34,7 @@ android { aidl = true buildConfig = true compose = true + prefab = true } kotlinOptions { @@ -113,4 +114,6 @@ dependencies { implementation(libs.markdown) implementation(libs.androidx.webkit) + + implementation(libs.lsposed.cxx) } \ No newline at end of file diff --git a/manager/app/src/main/cpp/CMakeLists.txt b/manager/app/src/main/cpp/CMakeLists.txt index cca26d5e4aef..4556ce01d5ec 100644 --- a/manager/app/src/main/cpp/CMakeLists.txt +++ b/manager/app/src/main/cpp/CMakeLists.txt @@ -7,6 +7,9 @@ cmake_minimum_required(VERSION 3.18.1) project("kernelsu") +find_package(cxx REQUIRED CONFIG) +link_libraries(cxx::cxx) + add_library(kernelsu SHARED jni.cc diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts index 6148df4d25cb..d1811cbc4ac8 100644 --- a/manager/build.gradle.kts +++ b/manager/build.gradle.kts @@ -15,16 +15,10 @@ cmaker { default { arguments.addAll( arrayOf( - "-DANDROID_STL=c++_static", + "-DANDROID_STL=none", ) ) - val flags = arrayOf( - "-Wno-gnu-string-literal-operator-template", - "-Wno-c++2b-extensions", - ) - cFlags.addAll(flags) - cppFlags.addAll(flags) - abiFilters("arm64-v8a", "x86_64") + abiFilters("arm64-v8a", "x86_64", "riscv64") } buildTypes { if (it.name == "release") { @@ -37,7 +31,7 @@ val androidMinSdkVersion = 26 val androidTargetSdkVersion = 34 val androidCompileSdkVersion = 34 val androidBuildToolsVersion = "34.0.0" -val androidCompileNdkVersion = "26.3.11579264" +val androidCompileNdkVersion = "27.0.11718014-beta1" val androidSourceCompatibility = JavaVersion.VERSION_21 val androidTargetCompatibility = JavaVersion.VERSION_21 val managerVersionCode by extra(getVersionCode()) diff --git a/manager/gradle/libs.versions.toml b/manager/gradle/libs.versions.toml index 3a1ea10e0e79..8b86099ffb54 100644 --- a/manager/gradle/libs.versions.toml +++ b/manager/gradle/libs.versions.toml @@ -75,4 +75,6 @@ sheet-compose-dialogs-core = { group = "com.maxkeppeler.sheets-compose-dialogs", sheet-compose-dialogs-list = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "list", version.ref = "sheets-compose-dialogs" } sheet-compose-dialogs-input = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "input", version.ref = "sheets-compose-dialogs" } -markdown = { group = "io.noties.markwon", name = "core", version.ref = "markdown" } \ No newline at end of file +markdown = { group = "io.noties.markwon", name = "core", version.ref = "markdown" } + +lsposed-cxx = { module = "org.lsposed.libcxx:libcxx", version = "27.0.11718014-beta1" } \ No newline at end of file From 00b9133aba089a2dbf6f29b7ae0f525b6810eed0 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Mon, 8 Jul 2024 22:36:32 +0800 Subject: [PATCH 3/3] Upgrade build tools --- .../app/src/main/java/me/weishu/kernelsu/ui/screen/Home.kt | 4 ++-- .../me/weishu/kernelsu/ui/viewmodel/SuperUserViewModel.kt | 6 +++--- manager/build.gradle.kts | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Home.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Home.kt index 6ecf53a8974e..b1e998888ca6 100644 --- a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Home.kt +++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Home.kt @@ -416,8 +416,8 @@ private fun InfoCard() { } fun getManagerVersion(context: Context): Pair { - val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0) - return Pair(packageInfo.versionName, packageInfo.versionCode) + val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)!! + return Pair(packageInfo.versionName!!, packageInfo.versionCode) } @Preview diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/viewmodel/SuperUserViewModel.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/viewmodel/SuperUserViewModel.kt index 37e05aa82aff..ecb5024aaed0 100644 --- a/manager/app/src/main/java/me/weishu/kernelsu/ui/viewmodel/SuperUserViewModel.kt +++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/viewmodel/SuperUserViewModel.kt @@ -45,7 +45,7 @@ class SuperUserViewModel : ViewModel() { val packageName: String get() = packageInfo.packageName val uid: Int - get() = packageInfo.applicationInfo.uid + get() = packageInfo.applicationInfo!!.uid val allowSu: Boolean get() = profile != null && profile.allowSu @@ -90,7 +90,7 @@ class SuperUserViewModel : ViewModel() { .toPinyinString(it.label).contains(search, true) }.filter { it.uid == 2000 // Always show shell - || showSystemApps || it.packageInfo.applicationInfo.flags.and(ApplicationInfo.FLAG_SYSTEM) == 0 + || showSystemApps || it.packageInfo.applicationInfo!!.flags.and(ApplicationInfo.FLAG_SYSTEM) == 0 } } @@ -146,7 +146,7 @@ class SuperUserViewModel : ViewModel() { apps = packages.map { val appInfo = it.applicationInfo - val uid = appInfo.uid + val uid = appInfo!!.uid val profile = Natives.getAppProfile(it.packageName, uid) AppInfo( label = appInfo.loadLabel(pm).toString(), diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts index d1811cbc4ac8..ade4608c0152 100644 --- a/manager/build.gradle.kts +++ b/manager/build.gradle.kts @@ -28,9 +28,9 @@ cmaker { } val androidMinSdkVersion = 26 -val androidTargetSdkVersion = 34 -val androidCompileSdkVersion = 34 -val androidBuildToolsVersion = "34.0.0" +val androidTargetSdkVersion = 35 +val androidCompileSdkVersion = 35 +val androidBuildToolsVersion = "35.0.0" val androidCompileNdkVersion = "27.0.11718014-beta1" val androidSourceCompatibility = JavaVersion.VERSION_21 val androidTargetCompatibility = JavaVersion.VERSION_21