diff --git a/.github/workflows/build-manager-manual.yml b/.github/workflows/build-manager-manual.yml index b4ace1b6..ff22257f 100644 --- a/.github/workflows/build-manager-manual.yml +++ b/.github/workflows/build-manager-manual.yml @@ -203,13 +203,6 @@ jobs: run: | export ANDROID_HOME=/root/.android/sdk export PATH=$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$PATH - { - echo 'org.gradle.parallel=true' - echo 'org.gradle.vfs.watch=true' - echo 'org.gradle.jvmargs=-Xmx2048m' - echo 'android.native.buildOutput=verbose' - } >> gradle.properties - sed -i 's/org.gradle.configuration-cache=true//g' gradle.properties ./gradlew clean assembleRelease - name: Upload build artifact diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml index fe9d03ea..cee47ccd 100644 --- a/.github/workflows/build-manager.yml +++ b/.github/workflows/build-manager.yml @@ -226,15 +226,8 @@ jobs: cp -f ../arm64-v8a/zakozakozako ../manager/app/src/main/jniLibs/arm64-v8a/libzakozakozako.so - name: Build with Gradle - run: | - { - echo 'org.gradle.parallel=true' - echo 'org.gradle.vfs.watch=true' - echo 'org.gradle.jvmargs=-Xmx2048m' - echo 'android.native.buildOutput=verbose' - } >> gradle.properties - sed -i 's/org.gradle.configuration-cache=true//g' gradle.properties - ./gradlew clean assembleRelease + run: ./gradlew clean assembleRelease + - name: Upload build artifact uses: actions/upload-artifact@v4 if: ${{ ( github.event_name != 'pull_request' && github.ref == 'refs/heads/main' ) || github.ref_type == 'tag' }} diff --git a/manager/app/build.gradle.kts b/manager/app/build.gradle.kts index fe0f0a85..ee3b591d 100644 --- a/manager/app/build.gradle.kts +++ b/manager/app/build.gradle.kts @@ -2,6 +2,7 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl import com.android.build.gradle.tasks.PackageAndroidArtifact +import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.agp.app) @@ -41,6 +42,7 @@ android { release { isMinifyEnabled = true isShrinkResources = true + vcsInfo.include = false proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } /**debug { diff --git a/manager/app/src/main/java/io/sukisu/ultra/UltraToolInstall.java b/manager/app/src/main/java/io/sukisu/ultra/UltraToolInstall.java index d6501b9e..7d1bfdb4 100644 --- a/manager/app/src/main/java/io/sukisu/ultra/UltraToolInstall.java +++ b/manager/app/src/main/java/io/sukisu/ultra/UltraToolInstall.java @@ -5,21 +5,25 @@ import com.topjohnwu.superuser.io.SuFile; import static com.sukisu.ultra.ui.util.KsuCliKt.getKpmmgrPath; import static com.sukisu.ultra.ui.util.KsuCliKt.getSuSFSDaemonPath; +import android.annotation.SuppressLint; + public class UltraToolInstall { private static final String OUTSIDE_KPMMGR_PATH = "/data/adb/ksu/bin/kpmmgr"; private static final String OUTSIDE_SUSFSD_PATH = "/data/adb/ksu/bin/susfsd"; + @SuppressLint("SetWorldReadable") + @SuppressWarnings("ResultOfMethodCallIgnored") public static void tryToInstall() { SuFile KpmmgrFile = new SuFile(OUTSIDE_KPMMGR_PATH); if (KpmmgrFile.exists()) { UltraShellHelper.CopyFileTo(getKpmmgrPath(), OUTSIDE_KPMMGR_PATH); - boolean _ = KpmmgrFile.setReadable(true, false); - boolean _ = KpmmgrFile.setExecutable(true, false); + KpmmgrFile.setReadable(true, false); + KpmmgrFile.setExecutable(true, false); } SuFile SuSFSDaemonFile = new SuFile(OUTSIDE_SUSFSD_PATH); if (SuSFSDaemonFile.exists()) { UltraShellHelper.CopyFileTo(getSuSFSDaemonPath(), OUTSIDE_SUSFSD_PATH); - boolean _ = SuSFSDaemonFile.setReadable(true, false); - boolean _ = SuSFSDaemonFile.setExecutable(true, false); + SuSFSDaemonFile.setReadable(true, false); + SuSFSDaemonFile.setExecutable(true, false); } } } diff --git a/manager/gradle.properties b/manager/gradle.properties index 62d1c743..980cafa3 100644 --- a/manager/gradle.properties +++ b/manager/gradle.properties @@ -1,4 +1,8 @@ android.experimental.enableNewResourceShrinker.preciseShrinking=true android.enableAppCompileTimeRClass=true android.useAndroidX=true -org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError +org.gradle.jvmargs=-Xmx2048m +org.gradle.parallel=true +org.gradle.vfs.watch=true +android.r8.maxWorkers=4 +android.native.buildOutput=verbose diff --git a/manager/gradle/libs.versions.toml b/manager/gradle/libs.versions.toml index 5e9f4188..42ef7671 100644 --- a/manager/gradle/libs.versions.toml +++ b/manager/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] accompanist-drawablepainter = "0.37.3" -agp = "8.12.1" +agp = "8.12.2" gson = "2.13.1" kotlin = "2.1.21" ksp = "2.1.21-2.0.1" -compose-bom = "2025.08.00" -lifecycle = "2.9.2" +compose-bom = "2025.08.01" +lifecycle = "2.9.3" navigation = "2.9.3" activity-compose = "1.10.1" kotlinx-coroutines = "1.10.2" diff --git a/manager/gradle/wrapper/gradle-wrapper.properties b/manager/gradle/wrapper/gradle-wrapper.properties index ff23a68d..2a84e188 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.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME