Merge branch 'main' into compose-refactor
This commit is contained in:
commit
aa3ad693b5
2 changed files with 3 additions and 3 deletions
4
.github/workflows/android_ci.yml
vendored
4
.github/workflows/android_ci.yml
vendored
|
|
@ -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
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue