More attempts to fix gradle cache on Windows

This commit is contained in:
topjohnwu 2020-12-27 20:13:50 -08:00
parent db4f78d463
commit 4662454938
2 changed files with 2 additions and 2 deletions

View File

@ -43,7 +43,6 @@ jobs:
echo "ANDROID_SDK_ROOT=$sdk_root" >> $env:GITHUB_ENV
echo "ANDROID_HOME=$sdk_root" >> $env:GITHUB_ENV
echo "MAGISK_NDK_VERSION=$ndk_ver" >> $env:GITHUB_ENV
echo "GRADLE_OPTS=-Dorg.gradle.daemon=false" >> $env:GITHUB_ENV
- name: Set up GitHub env (Unix)
if: runner.os != 'Windows'
@ -58,6 +57,7 @@ jobs:
path: |
~/.gradle/caches
~/.gradle/wrapper
!~/.gradle/caches/**/*.lock
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
restore-keys: ${{ runner.os }}-gradle-

View File

@ -8,7 +8,7 @@ android {
defaultConfig {
applicationId = "com.topjohnwu.magisk"
versionCode = 1
versionName = Config["appVersion"]
versionName = Config.appVersion
buildConfigField("String", "DEV_CHANNEL", Config["DEV_CHANNEL"] ?: "null")
buildConfigField("boolean", "CANARY", if (canary) "true" else "false")
}