From 067817bace9359359c82f73620420adef989ec0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 2 May 2021 13:49:28 +0200 Subject: [PATCH 1/3] Bump huawei-publish-gradle-plugin from 1.2.2 to 1.2.4 (#1314) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mikołaj Pich (cherry picked from commit 022a4d1ea21769f2c727fe2bfc39e7619de24d79) --- .github/workflows/deploy-store.yml | 13 ++++++------- .gitignore | 1 + app/build.gradle | 3 +-- build.gradle | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml index 3cd08e048..e7ed6b49a 100644 --- a/.github/workflows/deploy-store.yml +++ b/.github/workflows/deploy-store.yml @@ -62,14 +62,13 @@ jobs: gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-services.json.gpg gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg - - name: Build HMS version + - name: Prepare credentials + env: + AGC_CREDENTIALS: ${{ secrets.AGC_CREDENTIALS }} + run: echo $AGC_CREDENTIALS > ./app/src/release/agconnect-credentials.json + - name: Build and publish HMS version env: PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }} PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }} PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }} - run: ./gradlew assembleHmsRelease --stacktrace - - name: Upload APK to AppGallery - env: - AGC_CLIENT_ID: ${{ secrets.AGC_CLIENT_ID }} - AGC_CLIENT_SECRET: ${{ secrets.AGC_CLIENT_SECRET }} - run: ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace; + run: ./gradlew assembleHmsRelease --stacktrace && ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace diff --git a/.gitignore b/.gitignore index 5d3321e3f..3709487b2 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ Thumbs.db app/src/release/agconnect-services.json +app/src/release/agconnect-credentials.json diff --git a/app/build.gradle b/app/build.gradle index 02a3c90f4..ad8be4252 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -144,8 +144,7 @@ play { huaweiPublish { instances { hmsRelease { - clientId = System.getenv("AGC_CLIENT_ID") - clientSecret = System.getenv("AGC_CLIENT_SECRET") + credentialsPath = "$rootDir/app/src/release/agconnect-credentials.json" buildFormat = "apk" deployType = "draft" } diff --git a/build.gradle b/build.gradle index 222ea1779..1fdd073c9 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { classpath 'com.huawei.agconnect:agcp:1.5.1.200' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1' classpath "com.github.triplet.gradle:play-publisher:2.8.0" - classpath "ru.cian:huawei-publish-gradle-plugin:1.2.2" + classpath "ru.cian:huawei-publish-gradle-plugin:1.2.4" classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1" classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0" classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries" From 17761af9d6bd385adad876dce8bd8a5043db92f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Fri, 21 May 2021 12:35:57 +0200 Subject: [PATCH 2/3] Bump sdk --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ad8be4252..b93eee7f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -161,7 +161,7 @@ ext { } dependencies { - implementation "io.github.wulkanowy:sdk:1.1.5" + implementation "io.github.wulkanowy:sdk:f937a993c7" coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' From d20f3180cf79dc80c2be20bc45ce22ac58f54a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Fri, 21 May 2021 13:44:41 +0200 Subject: [PATCH 3/3] Version 1.1.6 --- app/build.gradle | 8 ++++---- app/src/main/play/release-notes/pl-PL/default.txt | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b93eee7f7..2fd01518d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ android { testApplicationId "io.github.tests.wulkanowy" minSdkVersion 17 targetSdkVersion 30 - versionCode 91 - versionName "1.1.5" + versionCode 92 + versionName "1.1.6" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -138,7 +138,7 @@ play { serviceAccountCredentials = file('key.p12') defaultToAppBundles = false track = 'production' - updatePriority = 1 + updatePriority = 5 } huaweiPublish { @@ -161,7 +161,7 @@ ext { } dependencies { - implementation "io.github.wulkanowy:sdk:f937a993c7" + implementation "io.github.wulkanowy:sdk:1.1.6" coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt index 868c75e3f..a6f3f44ef 100644 --- a/app/src/main/play/release-notes/pl-PL/default.txt +++ b/app/src/main/play/release-notes/pl-PL/default.txt @@ -1,5 +1,6 @@ -Wersja 1.1.5 +Wersja 1.1.6 -Naprawiliśmy liczenie średniej wszystkich ocen z całego roku +- naprawiliśmy błąd przy wysyłaniu wiadomości +- naprawiliśmy oznaczanie odwołanych lekcji jako zastępstwa Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases