forked from github/wulkanowy-mirror
Merge branch 'hotfix/messages-send'
This commit is contained in:
commit
b60c59216d
13
.github/workflows/deploy-store.yml
vendored
13
.github/workflows/deploy-store.yml
vendored
@ -62,14 +62,13 @@ jobs:
|
|||||||
gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-services.json.gpg
|
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/key.p12.gpg
|
||||||
gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.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:
|
env:
|
||||||
PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
|
PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
|
||||||
PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
|
PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
|
||||||
PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
|
PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
|
||||||
run: ./gradlew assembleHmsRelease --stacktrace
|
run: ./gradlew assembleHmsRelease --stacktrace && ./gradlew publishHuaweiAppGalleryHmsRelease --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;
|
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -117,3 +117,4 @@ Thumbs.db
|
|||||||
|
|
||||||
|
|
||||||
app/src/release/agconnect-services.json
|
app/src/release/agconnect-services.json
|
||||||
|
app/src/release/agconnect-credentials.json
|
||||||
|
@ -21,8 +21,8 @@ android {
|
|||||||
testApplicationId "io.github.tests.wulkanowy"
|
testApplicationId "io.github.tests.wulkanowy"
|
||||||
minSdkVersion 17
|
minSdkVersion 17
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
versionCode 91
|
versionCode 92
|
||||||
versionName "1.1.5"
|
versionName "1.1.6"
|
||||||
multiDexEnabled true
|
multiDexEnabled true
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables.useSupportLibrary = true
|
vectorDrawables.useSupportLibrary = true
|
||||||
@ -138,14 +138,13 @@ play {
|
|||||||
serviceAccountCredentials = file('key.p12')
|
serviceAccountCredentials = file('key.p12')
|
||||||
defaultToAppBundles = false
|
defaultToAppBundles = false
|
||||||
track = 'production'
|
track = 'production'
|
||||||
updatePriority = 1
|
updatePriority = 5
|
||||||
}
|
}
|
||||||
|
|
||||||
huaweiPublish {
|
huaweiPublish {
|
||||||
instances {
|
instances {
|
||||||
hmsRelease {
|
hmsRelease {
|
||||||
clientId = System.getenv("AGC_CLIENT_ID")
|
credentialsPath = "$rootDir/app/src/release/agconnect-credentials.json"
|
||||||
clientSecret = System.getenv("AGC_CLIENT_SECRET")
|
|
||||||
buildFormat = "apk"
|
buildFormat = "apk"
|
||||||
deployType = "draft"
|
deployType = "draft"
|
||||||
}
|
}
|
||||||
@ -162,7 +161,7 @@ ext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "io.github.wulkanowy:sdk:1.1.5"
|
implementation "io.github.wulkanowy:sdk:1.1.6"
|
||||||
|
|
||||||
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
|
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
|
||||||
|
|
||||||
|
@ -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
|
Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
|
||||||
|
@ -19,7 +19,7 @@ buildscript {
|
|||||||
classpath 'com.huawei.agconnect:agcp:1.5.1.200'
|
classpath 'com.huawei.agconnect:agcp:1.5.1.200'
|
||||||
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1'
|
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1'
|
||||||
classpath "com.github.triplet.gradle:play-publisher:2.8.0"
|
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 "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1"
|
||||||
classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
|
classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
|
||||||
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
|
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
|
||||||
|
Loading…
Reference in New Issue
Block a user