Merge branch '0.6.x'

.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

.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:

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"

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.**

app/src/main/play/pl-PL/whatsnew

@@ -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

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

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'
     }