Skip to content

Commit

Permalink
Update dependencies (#16)
Browse files Browse the repository at this point in the history
Update for mainswitchbar from 1.0.2 to 1.1.0 should be ignored in the future.

Co-authored-by: JingMatrix <[email protected]>
  • Loading branch information
CanerKaraca23 and JingMatrix committed Sep 1, 2024
1 parent 7a69ee2 commit f26d8d3
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 53 deletions.
33 changes: 18 additions & 15 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
groups:
actions:
patterns:
- "*"
- package-ecosystem: gitsubmodule
directory: /
schedule:
interval: monthly
groups:
submodule:
patterns:
- "*"
- package-ecosystem: gradle
directory: "/"
directory: /
schedule:
interval: daily
time: "21:00"
target-branch: master
registries:
- maven-google
- gradle-plugin
groups:
maven-dependencies:
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/"
39 changes: 20 additions & 19 deletions .github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/[email protected]
Expand Down Expand Up @@ -116,39 +117,39 @@ 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: |
magisk-loader/build/outputs/mapping
app/build/outputs/mapping
- name: Upload symbols
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: symbols
path: build/symbols
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ subprojects {

externalNativeBuild {
cmake {
version = "3.28.1+"
version = "3.29.8+"
buildStagingDirectory = layout.buildDirectory.get().asFile
}
}
Expand Down Expand Up @@ -119,4 +119,4 @@ subprojects {
targetCompatibility = androidTargetCompatibility
}
}
}
}
2 changes: 1 addition & 1 deletion external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion external/fmt
Submodule fmt updated 154 files
24 changes: 12 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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" }
Expand All @@ -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" }
Expand All @@ -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" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -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/.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##########################################################################
Expand Down

0 comments on commit f26d8d3

Please sign in to comment.