Merge branch 'LSPosed:master' into master

Author: JingMatrix

.github/workflows/crowdin.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches: [ master ]
     paths:
-      - manager/src/main/res/values/strings.xml
+    - manager/src/main/res/values/strings.xml
 
 jobs:
   synchronize-with-crowdin:

.github/workflows/main.yml

@@ -10,11 +10,14 @@ jobs:
   build:
     name: Build on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    if: ${{ !startsWith(github.event.head_commit.message, '[skip ci]') }}
     strategy:
-      fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
+    env:
+      CCACHE_COMPILERCHECK: '%compiler% -dumpmachine; %compiler% -dumpversion'
+      CCACHE_NOHASHDIR: 'true'
+      CCACHE_HARDLINK: 'true'
+      CCACHE_BASEDIR: '${{ github.workspace }}'
 
     steps:
     - name: Checkout
@@ -34,62 +37,54 @@ jobs:
           echo ${{ secrets.KEY_STORE }} | base64 --decode > key.jks
         fi
 
-    - name: Set up JDK 11
+    - name: Checkout libxposed/api
+      uses: actions/checkout@v3
+      with:
+        repository: libxposed/api
+        path: libxposed/api
+
+    - name: Checkout libxposed/service
+      uses: actions/checkout@v3
+      with:
+        repository: libxposed/service
+        path: libxposed/service
+
+    - name: Setup Java
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
-        cache: 'gradle'
 
-    - name: Cache gradle dependencies
-      uses: actions/cache@v3
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
       with:
-        path: |
-          ~/.gradle/caches
-          ~/.gradle/wrapper
-          !~/.gradle/caches/build-cache-*
-        key: gradle-deps-core-${{ hashFiles('**/build.gradle.kts') }}
-        restore-keys: |
-          gradle-deps
-
-    - name: Cache gradle build
-      uses: actions/cache@v3
-      with:
-        path: |
-          ~/.gradle/caches/build-cache-*
-          ~/.gradle/buildOutputCleanup/cache.properties
-        key: gradle-builds-core-${{ github.sha }}
-        restore-keys: |
-          gradle-builds
-
-    - name: Cache native build
-      uses: actions/cache@v3
+        gradle-home-cache-cleanup: true
+
+    - name: Set up ccache
+      uses: hendrikmuhs/[email protected]
       with:
-        path: |
-          ~/.ccache
-          patch-loader/build/.lto-cache
-        key: native-cache-${{ github.sha }}
-        restore-keys: native-cache-
+        max-size: 2G
+        key: ${{ runner.os }}
+        restore-keys: ${{ runner.os }}
+        save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
-    - name: Install dep
+    - name: Build dependencies
+      working-directory: libxposed
       run: |
-        sudo apt-get install -y ccache
-        ccache -o max_size=1G
-        ccache -o hash_dir=false
-        ccache -o compiler_check='%compiler% -dumpmachine; %compiler% -dumpversion'
-        ccache -zp
+        cd api
+        echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
+        ./gradlew :api:publishApiPublicationToMavenLocal
+        cd ..
+        cd service
+        echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
+        ./gradlew :interface:publishInterfacePublicationToMavenLocal
 
     - name: Build with Gradle
       run: |
-        [ $(du -s ~/.gradle/wrapper | awk '{ print $1 }') -gt 250000 ] && rm -rf ~/.gradle/wrapper/* || true
-        find ~/.gradle/caches -exec touch -d "2 days ago" {} + || true
-        echo 'org.gradle.caching=true' >> gradle.properties
         echo 'org.gradle.parallel=true' >> gradle.properties
-        echo 'org.gradle.vfs.watch=true' >> gradle.properties
         echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
         echo 'android.native.buildOutput=verbose' >> gradle.properties
         ./gradlew buildAll
-        ccache -s
 
     - name: Upload Debug artifact
       uses: actions/upload-artifact@v3

.gitmodules

@@ -5,7 +5,7 @@
 [submodule "core"]
 	path = core
 	url = https://github.com/LSPosed/LSPosed.git
-	branch = lspatch
+	branch = master
 [submodule "patch/libs/manifest-editor"]
 	path = patch/libs/manifest-editor
 	url = https://github.com/WindySha/ManifestEditor.git

apkzlib/build.gradle.kts

@@ -14,8 +14,8 @@ dependencies {
     implementation("com.google.code.findbugs:jsr305:3.0.2")
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
     implementation("org.bouncycastle:bcprov-jdk15on:1.70")
-    api("com.google.guava:guava:31.0.1-jre")
-    api("com.android.tools.build:apksig:7.1.2")
-    compileOnlyApi("com.google.auto.value:auto-value-annotations:1.9")
-    annotationProcessor("com.google.auto.value:auto-value:1.9")
+    api("com.google.guava:guava:32.0.1-jre")
+    api("com.android.tools.build:apksig:8.0.2")
+    compileOnlyApi("com.google.auto.value:auto-value-annotations:1.10.1")
+    annotationProcessor("com.google.auto.value:auto-value:1.10.1")
 }

build.gradle.kts

@@ -6,8 +6,8 @@ import org.eclipse.jgit.internal.storage.file.FileRepository
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder
 
 plugins {
-    id("com.android.application") apply false
-    id("com.android.library") apply false
+    alias(libs.plugins.agp.lib) apply false
+    alias(libs.plugins.agp.app) apply false
 }
 
 buildscript {
@@ -17,7 +17,7 @@ buildscript {
     }
     dependencies {
         classpath("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r")
-        classpath(kotlin("gradle-plugin", version = "1.7.20"))
+        classpath(kotlin("gradle-plugin", version = "1.8.21"))
     }
 }
 
@@ -54,8 +54,8 @@ val androidTargetSdkVersion by extra(33)
 val androidCompileSdkVersion by extra(33)
 val androidCompileNdkVersion by extra("25.1.8937393")
 val androidBuildToolsVersion by extra("33.0.1")
-val androidSourceCompatibility by extra(JavaVersion.VERSION_11)
-val androidTargetCompatibility by extra(JavaVersion.VERSION_11)
+val androidSourceCompatibility by extra(JavaVersion.VERSION_17)
+val androidTargetCompatibility by extra(JavaVersion.VERSION_17)
 
 tasks.register<Delete>("clean") {
     delete(rootProject.buildDir)

core

@@ -1,8 +1,3 @@
-android.experimental.enableNewResourceShrinker=true
 android.experimental.enableNewResourceShrinker.preciseShrinking=true
 android.enableAppCompileTimeRClass=true
-android.nonTransitiveRClass=true
-android.enableR8.fullMode=true
 android.useAndroidX=true
-
-agpVersion=7.4.0

gradle.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in