From 67b26336a129610c46369c7c23cf1141b4b79551 Mon Sep 17 00:00:00 2001 From: gao_cai_sheng Date: Sat, 17 Apr 2021 17:04:04 +0800 Subject: [PATCH 1/2] Update Version Code --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 8b7fa5fe4..fc9c0b482 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ android { targetSdkVersion 29 versionCode(getTimeStamp.call() as int) // versionName format: major.minor.accumulation.commit_id - versionName "0.8.17" + (getGitHeadRefsSuffix.call() as String) + versionName "0.8.18" + (getGitHeadRefsSuffix.call() as String) multiDexEnabled false ndk { abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' From c0ec72f90ec73651094a0d1fe6b25920a1b6f637 Mon Sep 17 00:00:00 2001 From: gao_cai_sheng Date: Sat, 17 Apr 2021 17:45:59 +0800 Subject: [PATCH 2/2] Update ci.yml Signed-off-by: gao_cai_sheng --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 053bd32e2..3a9100b61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,10 +16,10 @@ jobs: - uses: actions/checkout@v2 name: Clone repository - - name: Prepare Java 11 + - name: Prepare Java 15 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 15 java-package: jdk+fx - name: Cache Gradle packages @@ -32,8 +32,7 @@ jobs: - name: Build project run: | if ${{ !!github.head_ref }}; then echo "::warning:: Gradle $WARN_ON_PR"; fi - gradle wrapper - bash gradlew build + ./gradlew build - name: Upload articact uses: actions/upload-artifact@v2