diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3e684e62..bd7459cc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,23 +1,26 @@ version: 2 updates: - - package-ecosystem: gradle - directory: "/" + - package-ecosystem: github-actions + directory: / schedule: - interval: daily - time: "21:00" - target-branch: master - registries: - - maven-google - - gradle-plugin + interval: monthly groups: - maven-dependencies: + actions: + patterns: + - "*" + - package-ecosystem: gitsubmodule + directory: / + schedule: + interval: monthly + groups: + submodule: + patterns: + - "*" + - package-ecosystem: gradle + directory: / + schedule: + interval: daily + groups: + maven: patterns: - "*" - -registries: - maven-google: - type: maven-repository - url: "https://dl.google.com/dl/android/maven2/" - gradle-plugin: - type: maven-repository - url: "https://plugins.gradle.org/m2/" diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 52ee9c1f..d3b6ac79 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -24,9 +24,9 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: - submodules: "recursive" + submodules: recursive fetch-depth: 0 - name: Write key @@ -41,38 +41,39 @@ jobs: fi - name: Checkout libxposed/api - uses: actions/checkout@main + uses: actions/checkout@v4 with: repository: libxposed/api path: libxposed/api ref: 54582730315ba4a3d7cfaf9baf9d23c419e07006 - name: Checkout libxposed/service - uses: actions/checkout@main + uses: actions/checkout@v4 with: repository: libxposed/service path: libxposed/service - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: "temurin" - java-version: "21" + distribution: temurin + java-version: 21 - name: Setup Gradle - uses: gradle/gradle-build-action@v2 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 + + - name: Grant Execute Permission for gradlew + run: chmod +x gradlew - name: Setup ninja - uses: seanmiddleditch/gha-setup-ninja@master + uses: seanmiddleditch/gha-setup-ninja@v5 with: - version: 1.12.0 + version: 1.12.1 - name: Setup pnpm uses: pnpm/action-setup@v4 with: - version: 9 + version: latest - name: Setup ccache uses: hendrikmuhs/ccache-action@v1.2 @@ -116,31 +117,31 @@ jobs: unzip magisk-loader/release/LSPosed-v*-zygisk-debug.zip -d LSPosed-zygisk-debug - name: Upload riru release - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ steps.prepareArtifact.outputs.riruReleaseName }} path: "./LSPosed-riru-release/*" - name: Upload riru debug - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ steps.prepareArtifact.outputs.riruDebugName }} path: "./LSPosed-riru-debug/*" - name: Upload zygisk release - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ steps.prepareArtifact.outputs.zygiskReleaseName }} path: "./LSPosed-zygisk-release/*" - name: Upload zygisk debug - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ steps.prepareArtifact.outputs.zygiskDebugName }} path: "./LSPosed-zygisk-debug/*" - name: Upload mappings - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: mappings path: | @@ -148,7 +149,7 @@ jobs: app/build/outputs/mapping - name: Upload symbols - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: symbols path: build/symbols diff --git a/build.gradle.kts b/build.gradle.kts index df9153ed..3dc0fa1f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -88,7 +88,7 @@ subprojects { externalNativeBuild { cmake { - version = "3.28.1+" + version = "3.29.8+" buildStagingDirectory = layout.buildDirectory.get().asFile } } @@ -119,4 +119,4 @@ subprojects { targetCompatibility = androidTargetCompatibility } } -} +} \ No newline at end of file diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 439c9581..5d733733 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -108,4 +108,4 @@ add_subdirectory(dobby) add_subdirectory(fmt) add_subdirectory(lsplant/lsplant/src/main/jni) add_subdirectory(lsplt/lsplt/src/main/jni) -target_compile_definitions(fmt-header-only INTERFACE FMT_STATIC_THOUSANDS_SEPARATOR=1 FMT_USE_FLOAT=0 FMT_USE_DOUBLE=0 FMT_USE_LONG_DOUBLE=0) +target_compile_definitions(fmt-header-only INTERFACE FMT_STATIC_THOUSANDS_SEPARATOR=1 FMT_USE_FLOAT=0 FMT_USE_DOUBLE=0 FMT_USE_LONG_DOUBLE=0 FMT_USE_BITINT=0) diff --git a/external/fmt b/external/fmt index 75e89242..8c4cfab5 160000 --- a/external/fmt +++ b/external/fmt @@ -1 +1 @@ -Subproject commit 75e892420ed84a058f0a494d693a6baf5212eac4 +Subproject commit 8c4cfab57add08231c14c6c8b532ce1f11d6a6c3 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 85d068c0..05c49280 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -agp = "8.6.0-beta01" -kotlin = "1.9.23" +agp = "8.6.0" +kotlin = "2.0.20" nav = "2.7.7" appcenter = "5.0.4" libxposed = "100" @@ -14,7 +14,7 @@ kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } nav-safeargs = { id = "androidx.navigation.safeargs", version.ref = "nav" } autoresconfig = { id = "dev.rikka.tools.autoresconfig", version = "1.2.2" } materialthemebuilder = { id = "dev.rikka.tools.materialthemebuilder", version = "1.4.1" } -lsplugin-resopt = { id = "org.lsposed.lsplugin.resopt", version = "1.5" } +lsplugin-resopt = { id = "org.lsposed.lsplugin.resopt", version = "1.6" } lsplugin-apksign = { id = "org.lsposed.lsplugin.apksign", version = "1.4" } lsplugin-cmaker = { id = "org.lsposed.lsplugin.cmaker", version = "1.2" } lsplugin-jgit = { id = "org.lsposed.lsplugin.jgit", version = "1.1" } @@ -35,12 +35,12 @@ rikkax-recyclerview = { module = "dev.rikka.rikkax.recyclerview:recyclerview-ktx rikkax-widget-borderview = { module = "dev.rikka.rikkax.widget:borderview", version = "1.1.0" } rikkax-widget-mainswitchbar = { module = "dev.rikka.rikkax.widget:mainswitchbar", version = "1.0.2" } -androidx-activity = { module = "androidx.activity:activity", version = "1.8.2" } -androidx-annotation = { module = "androidx.annotation:annotation", version = "1.7.1" } -androidx-browser = { module = "androidx.browser:browser", version = "1.7.0" } +androidx-activity = { module = "androidx.activity:activity", version = "1.9.1" } +androidx-annotation = { module = "androidx.annotation:annotation", version = "1.8.2" } +androidx-browser = { module = "androidx.browser:browser", version = "1.8.0" } androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.1.4" } -androidx-core = { module = "androidx.core:core", version = "1.12.0" } -androidx-fragment = { module = "androidx.fragment:fragment", version = "1.6.2" } +androidx-core = { module = "androidx.core:core", version = "1.13.1" } +androidx-fragment = { module = "androidx.fragment:fragment", version = "1.8.2" } androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "nav" } androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "nav" } androidx-preference = { module = "androidx.preference:preference", version = "1.2.1" } @@ -56,12 +56,12 @@ okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-i agp-apksig = { group = "com.android.tools.build", name = "apksig", version.ref = "agp" } appiconloader = { module = "me.zhanghai.android.appiconloader:appiconloader", version = "1.5.0" } -commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.14.0" } -material = { module = "com.google.android.material:material", version = "1.11.0" } -gson = { module = "com.google.code.gson:gson", version = "2.10.1" } +commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.17.0" } +material = { module = "com.google.android.material:material", version = "1.12.0" } +gson = { module = "com.google.code.gson:gson", version = "2.11.0" } hiddenapibypass = { module = "org.lsposed.hiddenapibypass:hiddenapibypass", version = "4.3" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } -kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.3" } +kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.8.1" } libxposed-api = { group = "io.github.libxposed", name = "api", version.ref = "libxposed" } libxposed-interface = { group = "io.github.libxposed", name = "interface", version.ref = "libxposed" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a..9355b415 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a42..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,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/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30db..9d21a218 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ##########################################################################