Merge branch 'master' of https://github.com/LSPosed/LSPlant into aliucord

Author: Juby210

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: yujincheng08

.github/dependabot.yml

@@ -5,16 +5,8 @@ updates:
     schedule:
       interval: daily
       time: "21:00"
-    open-pull-requests-limit: 10
     target-branch: master
-    registries:
-      - maven-google
-      - gralde-plugin
-
-registries:
-  maven-google:
-    type: maven-repository
-    url: "https://dl.google.com/dl/android/maven2/"
-  gralde-plugin:
-    type: maven-repository
-    url: "https://plugins.gradle.org/m2/"
+    groups:
+      maven-dependencies:
+        patterns:
+          - "*"

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-13 ]
+        os: [ ubuntu-latest, windows-latest, macos-14 ]
 
     steps:
       - name: Check out
@@ -30,11 +30,17 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
           cache: 'gradle'
+      - uses: seanmiddleditch/gha-setup-ninja@master
+        with:
+          version: 1.12.0
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1
         with:
           key: ${{ runner.os }}-${{ github.sha }}
           restore-keys: ${{ runner.os }}
+      - name: Remove Android's cmake
+        shell: bash
+        run: rm -rf $ANDROID_HOME/cmake
       - name: Build with Gradle
         run: |
           ccache -o cache_dir=${{ github.workspace }}/.ccache
@@ -157,6 +163,9 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
           cache: 'gradle'
+      - uses: seanmiddleditch/gha-setup-ninja@master
+        with:
+          version: 1.12.0
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1
         with:
@@ -175,6 +184,7 @@ jobs:
           arch: ${{ matrix.arch }}
           target: ${{ matrix.target }}
           script: |
+            rm -rf $ANDROID_HOME/cmake
             ccache -o cache_dir=${{ github.workspace }}/.ccache
             ccache -o hash_dir=false
             ccache -o compiler_check='%compiler% -dumpmachine; %compiler% -dumpversion'

.github/workflows/maven.yml

@@ -17,11 +17,16 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
+          distribution: 'temurin'
           java-version: '17'
           cache: 'gradle'
+      - uses: seanmiddleditch/gha-setup-ninja@master
+        with:
+          version: 1.12.0
       - name: Build with Gradle
-        run: ./gradlew :lsplant:publish
+        run: |
+          rm -rf $ANDROID_HOME/cmake
+          ./gradlew :lsplant:publish
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

README.md

@@ -1,7 +1,7 @@
 # LSPlant
 
 ![](https://img.shields.io/badge/license-LGPL--3.0-orange.svg)
-![](https://img.shields.io/badge/Android-5.0%20--%2014-blue.svg)
+![](https://img.shields.io/badge/Android-5.0%20--%2015%20Beta2-blue.svg)
 ![](https://img.shields.io/badge/arch-armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86--64%7C%20riscv64-brightgreen.svg)
 ![](https://github.com/LSPosed/LSPlant/actions/workflows/build.yml/badge.svg?branch=master&event=push)
 ![](https://img.shields.io/maven-central/v/org.lsposed.lsplant/lsplant.svg)
@@ -12,7 +12,7 @@ This project is part of LSPosed framework under GNU Lesser General Public Licens
 
 ## Features
 
-+ Support Android 5.0 - 14 (API level 21 - 34)
++ Support Android 5.0 - 15 Beta2 (API level 21 - 35)
 + Support armeabi-v7a, arm64-v8a, x86, x86-64, riscv64
 + Support customized inline hook framework and ART symbol resolver
 
@@ -38,15 +38,15 @@ android {
 }
 
 dependencies {
-    implementation "org.lsposed.lsplant:lsplant:5.2"
+    implementation "org.lsposed.lsplant:lsplant:+"
 }
 ```
 
 If you don't want to include `libc++_shared.so` in your APK, you can use `lsplant-standalone` instead:
 
 ```gradle
 dependencies {
-    implementation "org.lsposed.lsplant:lsplant-standalone:5.2"
+    implementation "org.lsposed.lsplant:lsplant-standalone:+"
 }
 ```
 

build.gradle.kts

@@ -1,9 +1,9 @@
 plugins {
 }
 
-val androidTargetSdkVersion by extra(34)
+val androidTargetSdkVersion by extra(35)
 val androidMinSdkVersion by extra(21)
-val androidBuildToolsVersion by extra("34.0.0")
-val androidCompileSdkVersion by extra(34)
-val androidNdkVersion by extra("26.1.10909125")
-val androidCmakeVersion by extra("3.22.1+")
+val androidBuildToolsVersion by extra("35.0.0")
+val androidCompileSdkVersion by extra(35)
+val androidNdkVersion by extra("27.0.12077973")
+val androidCmakeVersion by extra("3.28.0+")

gradle.properties

@@ -2,5 +2,4 @@ android.nonTransitiveRClass=true
 android.useAndroidX=true
 android.experimental.testOptions.managedDevices.allowOldApiLevelDevices=true
 android.library.defaults.buildfeatures.androidresources=false
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.2.2"
+agp = "8.5.2"
 
 [plugins]
 agp-app = { id = "com.android.application", version.ref = "agp" }
@@ -9,9 +9,9 @@ lsplugin-publish = { id = "org.lsposed.lsplugin.publish", version = "1.1" }
 lsplugin-cmaker = { id = "org.lsposed.lsplugin.cmaker", version = "1.2" }
 
 [libraries]
-cxx = { module = "dev.rikka.ndk.thirdparty:cxx", version = "1.2.0" }
+cxx = { module = "org.lsposed.libcxx:libcxx", version = "27.0.12077973" }
 dobby = { module = "io.github.vvb2060.ndk:dobby", version = "1.2" }
-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.5" }
-test-runner = { module = "androidx.test:runner", version = "1.5.2" }
-test-espresso = { module = "androidx.test.espresso:espresso-core", version = "3.5.1" }
+test-ext-junit = { module = "androidx.test.ext:junit", version = "1.2.1" }
+test-runner = { module = "androidx.test:runner", version = "1.6.1" }
+test-espresso = { module = "androidx.test.espresso:espresso-core", version = "3.6.1" }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME