Merge branch 'main' into compose-refactor

Super12138 · Feb 7, 2025 · aa3ad69 · aa3ad69
2 parents 758f099 + a181480
commit aa3ad69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
 
       - name: set up JDK 21
-        uses: actions/setup-java@v4.6.0
+        uses: actions/setup-java@v4.7.0
         with:
           java-version: '21'
           distribution: 'temurin'
@@ -41,7 +41,7 @@ jobs:
 
       - name: Upload APK
         if: success() && github.event_name != 'pull_request' && github.repository == 'Super12138/ToDo'
-        uses: actions/upload-artifact@v4.5.0
+        uses: actions/upload-artifact@v4.6.0
         with:
           name: Release
           path: ${{ github.workspace }}/app/build/outputs/apk/release
diff --git 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.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME