diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ae402f53..d4e59be19 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -159,7 +159,7 @@ jobs: openssl aes-256-cbc -d -in ./app/upload-key-encrypted.jks -k $ENCRYPT_KEY >> ./app/upload-key.jks - run: name: Publish release - command: ./gradlew publishRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex + command: ./gradlew publish --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex workflows: version: 2 diff --git a/.travis.yml b/.travis.yml index 9034de610..e1d86ee37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,10 @@ cache: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ +#branches: +# only: +# - master + android: licenses: - android-sdk-preview-license-.+ @@ -56,7 +60,7 @@ script: gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg; gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg; gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg; - ./gradlew publishRelease -PenableCrashlytics --stacktrace; + ./gradlew publish -PenableCrashlytics --stacktrace; fi after_success: diff --git a/app/build.gradle b/app/build.gradle index 4d199db2d..7d87553a4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,24 +11,16 @@ android { compileSdkVersion 28 buildToolsVersion '28.0.3' - playAccountConfigs { - defaultAccountConfig { - serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") - pk12File = file('key.p12') - } - } - defaultConfig { applicationId "io.github.wulkanowy" testApplicationId "io.github.tests.wulkanowy" minSdkVersion 15 targetSdkVersion 28 - versionCode 24 - versionName "0.6.5" + versionCode 25 + versionName "0.6.6" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true - playAccountConfig = playAccountConfigs.defaultAccountConfig manifestPlaceholders = [ fabric_api_key: System.getenv("FABRIC_API_KEY") ?: "null", crashlytics_enabled: project.hasProperty("enableCrashlytics") @@ -72,14 +64,16 @@ androidExtensions { } play { + serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf" + serviceAccountCredentials = file('key.p12') + defaultToAppBundles = true track = 'alpha' - uploadImages = false } dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation('io.github.wulkanowy:api:0.6.4') { exclude module: "threetenbp" } + implementation('io.github.wulkanowy:api:0.6.6') { exclude module: "threetenbp" } implementation "androidx.legacy:legacy-support-v4:1.0.0" implementation "androidx.appcompat:appcompat:1.0.2" diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 589b5f34b..12360845c 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -14,7 +14,6 @@ #Config for anallitycs -keepattributes *Annotation* -keepattributes SourceFile,LineNumberTable --renamesourcefileattribute SourceFile -keep class com.crashlytics.** {*;} -keep public class * extends java.lang.Exception -dontwarn com.crashlytics.** diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png deleted file mode 100644 index de216d36b..000000000 Binary files a/app/src/main/ic_launcher-web.png and /dev/null differ diff --git a/app/src/main/play/contactEmail b/app/src/main/play/contact-email.txt similarity index 100% rename from app/src/main/play/contactEmail rename to app/src/main/play/contact-email.txt diff --git a/app/src/main/play/contactPhone b/app/src/main/play/contact-phone.txt similarity index 100% rename from app/src/main/play/contactPhone rename to app/src/main/play/contact-phone.txt diff --git a/app/src/main/play/contactWebsite b/app/src/main/play/contact-website.txt similarity index 100% rename from app/src/main/play/contactWebsite rename to app/src/main/play/contact-website.txt diff --git a/app/src/main/play/defaultLanguage b/app/src/main/play/default-language.txt similarity index 100% rename from app/src/main/play/defaultLanguage rename to app/src/main/play/default-language.txt diff --git a/app/src/main/play/pl-PL/listing/fulldescription b/app/src/main/play/listings/pl-PL/full-description.txt similarity index 100% rename from app/src/main/play/pl-PL/listing/fulldescription rename to app/src/main/play/listings/pl-PL/full-description.txt diff --git a/app/src/main/play/pl-PL/listing/featureGraphic/feature.png b/app/src/main/play/listings/pl-PL/graphics/feature-graphic/feature.png similarity index 100% rename from app/src/main/play/pl-PL/listing/featureGraphic/feature.png rename to app/src/main/play/listings/pl-PL/graphics/feature-graphic/feature.png diff --git a/app/src/main/play/listings/pl-PL/graphics/icon/icon.png b/app/src/main/play/listings/pl-PL/graphics/icon/icon.png new file mode 100644 index 000000000..8c33c2f92 Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/icon/icon.png differ diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/account-switcher.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/account-switcher.png similarity index 100% rename from app/src/main/play/pl-PL/listing/phoneScreenshots/account-switcher.png rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/account-switcher.png diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-dialog.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-dialog.png similarity index 100% rename from app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-dialog.png rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-dialog.png diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-statistics.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-statistics.png similarity index 100% rename from app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-statistics.png rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-statistics.png diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/grades.png similarity index 100% rename from app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/grades.png diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/more.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/more.png similarity index 100% rename from app/src/main/play/pl-PL/listing/phoneScreenshots/more.png rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/more.png diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-dialog.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-dialog.png similarity index 100% rename from app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-dialog.png rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-dialog.png diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-widget.png similarity index 100% rename from app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-widget.png diff --git a/app/src/main/play/pl-PL/listing/shortdescription b/app/src/main/play/listings/pl-PL/short-description.txt similarity index 100% rename from app/src/main/play/pl-PL/listing/shortdescription rename to app/src/main/play/listings/pl-PL/short-description.txt diff --git a/app/src/main/play/pl-PL/listing/title b/app/src/main/play/listings/pl-PL/title.txt similarity index 100% rename from app/src/main/play/pl-PL/listing/title rename to app/src/main/play/listings/pl-PL/title.txt diff --git a/app/src/main/play/pl-PL/listing/icon/icon.png b/app/src/main/play/pl-PL/listing/icon/icon.png deleted file mode 100644 index de216d36b..000000000 Binary files a/app/src/main/play/pl-PL/listing/icon/icon.png and /dev/null differ diff --git a/app/src/main/play/pl-PL/listing/video b/app/src/main/play/pl-PL/listing/video deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/src/main/play/pl-PL/whatsnew b/app/src/main/play/pl-PL/whatsnew deleted file mode 100644 index 70c0352ad..000000000 --- a/app/src/main/play/pl-PL/whatsnew +++ /dev/null @@ -1,6 +0,0 @@ -Wersja 0.6.5 - -- zmieniono ikonę zmiany semestru w ocenach -- naprawiono wyświetlanie szczegółowych informacji o błędach - -Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases/tag/0.6.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 new file mode 100644 index 000000000..c8a56ad42 --- /dev/null +++ b/app/src/main/play/release-notes/pl-PL/default.txt @@ -0,0 +1,7 @@ +Wersja 0.6.6 + +- poprawiono problemy ze stabilnością w widoku ocen i wiadomości +- naprawiono wyświetlanie powiadomień po ich ponownym włączeniu po długim czasie +- ograniczono ilość zbędnych informacji na widżecie planu lekcji + +Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases/tag/0.6.6 diff --git a/build.gradle b/build.gradle index d2f68da07..444088e1c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.11' + ext.kotlin_version = '1.3.20' repositories { mavenCentral() google() @@ -12,7 +12,7 @@ buildscript { classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.google.gms:google-services:4.2.0' classpath "io.fabric.tools:gradle:1.27.0" - classpath "com.github.triplet.gradle:play-publisher:1.2.2" + classpath "com.github.triplet.gradle:play-publisher:2.1.0" classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7" classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02' }