Add Dependabot, Update Dependencies and Workflows (#1440)

Build may fail because of some major dependency updates. Needs changes, changes/fixes welcomed. Main goal is keeping all things up-to-date. --------- Co-authored-by: weishu <[email protected]>
tiann · Mar 20, 2024 · 8f33926 · 8f33926
1 parent 2b0d199
commit 8f33926
Show file tree

Hide file tree

Showing 22 changed files with 1,038 additions and 1,330 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,21 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
+
+  - package-ecosystem: cargo
+    directory: userspace/ksud
+    schedule:
+      interval: daily
+
+  - package-ecosystem: gradle
+    directory: manager
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: website
+    schedule:
+      interval: daily
diff --git a/.github/workflows/add-device.yml b/.github/workflows/add-device.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Make pull request
         if: steps.handle-add-device.outputs.success == 'true'
         id: cpr
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "[add device]: ${{ steps.handle-add-device.outputs.device }}"
@@ -53,7 +53,7 @@ jobs:
           message: "Cannot create pull request. Please check the issue content. Or you can create a pull request manually."
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: close issue
-        uses: peter-evans/close-issue@v1
+        uses: peter-evans/close-issue@v3
         with:
           issue-number: ${{ github.event.issue.number }}
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/avd-kernel.yml b/.github/workflows/avd-kernel.yml
@@ -137,7 +137,7 @@ jobs:
       - name: Bot session cache
         if: github.event_name == 'push' && github.ref == 'refs/heads/main' || github.ref_type == 'tag'
         id: bot_session_cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: scripts/ksubot.session
           key: ${{ runner.os }}-bot-session

diff --git a/.github/workflows/build-kernel-a12.yml b/.github/workflows/build-kernel-a12.yml
@@ -83,7 +83,7 @@ jobs:
 
       - name: Bot session cache
         id: bot_session_cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         if: false
         with:
           path: scripts/ksubot.session

diff --git a/.github/workflows/build-kernel-a13.yml b/.github/workflows/build-kernel-a13.yml
@@ -118,7 +118,7 @@ jobs:
 
       - name: Bot session cache
         id: bot_session_cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         if: false
         with:
           path: scripts/ksubot.session

diff --git a/.github/workflows/build-kernel-a14.yml b/.github/workflows/build-kernel-a14.yml
@@ -97,7 +97,7 @@ jobs:
 
       - name: Bot session cache
         id: bot_session_cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         if: false
         with:
           path: scripts/ksubot.session

diff --git a/.github/workflows/build-kernel-arcvm.yml b/.github/workflows/build-kernel-arcvm.yml
@@ -119,7 +119,7 @@ jobs:
       - name: Bot session cache
         if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/main' ) || github.ref_type == 'tag' }}
         id: bot_session_cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: scripts/ksubot.session
           key: ${{ runner.os }}-bot-session

diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml
@@ -71,7 +71,7 @@ jobs:
           java-version: "17"
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           gradle-home-cache-cleanup: true
 

diff --git a/.github/workflows/build-su.yml b/.github/workflows/build-su.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Bot session cache
       if: github.event_name != 'pull_request' && steps.need_upload.outputs.UPLOAD == 'true'
       id: bot_session_cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: scripts/ksubot.session
         key: ${{ runner.os }}-bot-session

diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
@@ -22,14 +22,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      # cross build failed after Rust 1.68, see https://github.com/cross-rs/cross/issues/1222
-      - run: rustup default 1.67.0
+      - run: rustup update --force-non-host stable-x86_64-unknown-linux-gnu
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: userspace/ksud
 
       - name: Install cross
-        run: cargo install cross --locked
+        run: |
+          cargo install cross --git https://github.com/cross-rs/cross --rev 66845c1
 
       - name: Run clippy
         run: |

diff --git a/.github/workflows/ksud.yml b/.github/workflows/ksud.yml
@@ -28,10 +28,9 @@ jobs:
       run: |
         cp android*-lkm/*_kernelsu.ko ./userspace/ksud/bin/aarch64/
         
-    # cross build failed after Rust 1.68, see https://github.com/cross-rs/cross/issues/1222
     - name: Setup rustup
       run: |
-        rustup default 1.67.0
+        rustup update stable
         rustup target add x86_64-apple-darwin
         rustup target add aarch64-apple-darwin
     - uses: Swatinem/rust-cache@v2
@@ -40,10 +39,11 @@ jobs:
         cache-targets: false
 
     - name: Install cross
-      run: cargo install cross --locked
+      run: |
+        cargo install cross --git https://github.com/cross-rs/cross --rev 66845c1
 
     - name: Build ksud
-      run: cross build --target ${{ inputs.target }} --release --manifest-path ./userspace/ksud/Cargo.toml
+      run: CROSS_NO_WARNINGS=0 cross build --target ${{ inputs.target }} --release --manifest-path ./userspace/ksud/Cargo.toml
 
     - name: Upload ksud artifact
       uses: actions/upload-artifact@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -67,7 +67,7 @@ jobs:
         run: ls -R
 
       - name: release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: |
             manager/*.apk

diff --git a/.github/workflows/wsa-kernel.yml b/.github/workflows/wsa-kernel.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Cache LLVM
         id: cache-llvm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ./llvm
           key: llvm-12.0.1
@@ -106,7 +106,7 @@ jobs:
       - name: Bot session cache
         if: github.event_name == 'push' && github.ref == 'refs/heads/main' || github.ref_type == 'tag'
         id: bot_session_cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: scripts/ksubot.session
           key: ${{ runner.os }}-bot-session

diff --git a/manager/app/build.gradle.kts b/manager/app/build.gradle.kts
@@ -40,7 +40,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.3"
+        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
 
     packaging {

diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts
@@ -36,7 +36,7 @@ val androidMinSdkVersion = 26
 val androidTargetSdkVersion = 33
 val androidCompileSdkVersion = 34
 val androidBuildToolsVersion = "34.0.0"
-val androidCompileNdkVersion = "25.2.9519653"
+val androidCompileNdkVersion = "26.2.11394342"
 val androidSourceCompatibility = JavaVersion.VERSION_17
 val androidTargetCompatibility = JavaVersion.VERSION_17
 val managerVersionCode by extra(getVersionCode())

diff --git a/manager/gradle/libs.versions.toml b/manager/gradle/libs.versions.toml
@@ -1,27 +1,39 @@
 [versions]
-agp = "8.3.0"
-kotlin = "1.8.10"
-ksp = "1.8.10-1.0.9"
-compose-bom = "2023.06.01"
-lifecycle = "2.6.1"
-accompanist = "0.30.1"
-navigation = "2.6.0"
-compose-destination = "1.9.42-beta"
-libsu = "5.2.1"
-sheets-compose-dialogs = "1.2.0"
+agp = "8.3.1"
+kotlin = "1.9.22"
+ksp = "1.9.22-1.0.18"
+compose-compiler = "1.5.10"
+compose-bom = "2024.02.02"
+lifecycle = "2.7.0"
+accompanist = "0.34.0"
+navigation = "2.7.7"
+activity-compose = "1.8.2"
+kotlinx-coroutines = "1.8.0"
+coil-compose = "2.6.0"
+compose-destination = "1.10.2"
+sheets-compose-dialogs = "1.3.0"
 markdown = "4.6.2"
 webkit = "1.10.0"
+appiconloader-coil = "1.5.0"
+parcelablelist = "2.0.1"
+libsu = "5.2.2"
+apksign = "1.4"
+cmaker = "1.2"
 
 [plugins]
 agp-app = { id = "com.android.application", version.ref = "agp" }
 agp-lib = { id = "com.android.library", version.ref = "agp" }
+
 kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-lsplugin-apksign = { id = "org.lsposed.lsplugin.apksign", version = "1.1" }
-lsplugin-cmaker = { id = "org.lsposed.lsplugin.cmaker", version = "1.1" }
+
+lsplugin-apksign = { id = "org.lsposed.lsplugin.apksign", version.ref = "apksign" }
+lsplugin-cmaker = { id = "org.lsposed.lsplugin.cmaker", version.ref = "cmaker" }
 
 [libraries]
-androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version = "1.7.1" }
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" }
+
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
 
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
@@ -38,6 +50,7 @@ androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lif
 androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
 
 androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "webkit" }
+
 com-google-accompanist-drawablepainter = { group = "com.google.accompanist", name = "accompanist-drawablepainter", version.ref = "accompanist" }
 com-google-accompanist-navigation-animation = { group = "com.google.accompanist", name = "accompanist-navigation-animation", version.ref = "accompanist" }
 com-google-accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" }
@@ -47,19 +60,19 @@ com-github-topjohnwu-libsu-core = { group = "com.github.topjohnwu.libsu", name =
 com-github-topjohnwu-libsu-service = { group = "com.github.topjohnwu.libsu", name = "service", version.ref = "libsu" }
 com-github-topjohnwu-libsu-io= { group = "com.github.topjohnwu.libsu", name = "io", version.ref = "libsu" }
 
-dev-rikka-rikkax-parcelablelist = { module = "dev.rikka.rikkax.parcelablelist:parcelablelist", version = "2.0.1" }
+dev-rikka-rikkax-parcelablelist = { module = "dev.rikka.rikkax.parcelablelist:parcelablelist", version.ref = "parcelablelist" }
 
-io-coil-kt-coil-compose = { group = "io.coil-kt", name = "coil-compose", version = "2.3.0" }
+io-coil-kt-coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil-compose" }
 
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.7.1" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 
-me-zhanghai-android-appiconloader-coil = { group = "me.zhanghai.android.appiconloader", name = "appiconloader-coil", version = "1.5.0" }
+me-zhanghai-android-appiconloader-coil = { group = "me.zhanghai.android.appiconloader", name = "appiconloader-coil", version.ref = "appiconloader-coil" }
 
 compose-destinations-animations-core = { group = "io.github.raamcosta.compose-destinations", name = "animations-core", version.ref = "compose-destination" }
 compose-destinations-ksp = { group = "io.github.raamcosta.compose-destinations", name = "ksp", version.ref = "compose-destination" }
 
-sheet-compose-dialogs-core = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "core", version.ref = "sheets-compose-dialogs"}
-sheet-compose-dialogs-list = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "list", version.ref = "sheets-compose-dialogs"}
-sheet-compose-dialogs-input = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "input", version.ref = "sheets-compose-dialogs"}
+sheet-compose-dialogs-core = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "core", version.ref = "sheets-compose-dialogs" }
+sheet-compose-dialogs-list = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "list", version.ref = "sheets-compose-dialogs" }
+sheet-compose-dialogs-input = { group = "com.maxkeppeler.sheets-compose-dialogs", name = "input", version.ref = "sheets-compose-dialogs" }
 
 markdown = { group = "io.noties.markwon", name = "core", version.ref = "markdown" }