Bump version to 2.7.5

build.gradle

@@ -2,26 +2,32 @@
 
 buildscript {
     ext.objectboxVersion = '2.5.1'
-    ext.booster_version = '1.0.0'
+    ext.booster_version = '1.5.1'
     ext.isProprietary = getGradle().getStartParameter().getTaskRequests().toString().contains("Proprietary")
     repositories {
         google()
         jcenter()
-        maven { url 'https://maven.fabric.io/public' }
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         if (isProprietary) {
-            classpath 'com.google.gms:google-services:4.3.2'
-            classpath 'io.fabric.tools:gradle:1.28.1'
+            classpath 'com.google.gms:google-services:4.3.3'
+            classpath 'com.google.firebase:firebase-crashlytics-gradle:2.0.0-beta03'
             classpath "com.tencent.mm:AndResGuard-gradle-plugin:1.2.17"
         }
         classpath "io.objectbox:objectbox-gradle-plugin:$objectboxVersion"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
         classpath "com.didiglobal.booster:booster-gradle-plugin:$booster_version"
-        classpath "com.didiglobal.booster:booster-task-all:$booster_version"
-        classpath "com.didiglobal.booster:booster-transform-all:$booster_version"
+        classpath "com.didiglobal.booster:booster-transform-thread:$booster_version"
+        classpath "com.didiglobal.booster:booster-transform-webview:$booster_version"
+        classpath "com.didiglobal.booster:booster-transform-shared-preferences:$booster_version"
+        classpath "com.didiglobal.booster:booster-transform-r-inline:$booster_version"
+        classpath "com.didiglobal.booster:booster-transform-toast:$booster_version"
+        classpath "com.didiglobal.booster:booster-transform-activity-thread:$booster_version"
+        classpath "com.didiglobal.booster:booster-task-resource-deredundancy:$booster_version"
+        classpath "com.didiglobal.booster:booster-task-compression-processed-res:$booster_version"
+        classpath "com.didiglobal.booster:booster-task-compression-cwebp:$booster_version"
     }
 }
 

fastlane/metadata/android/en-US/changelogs/2.7.5.txt

@@ -0,0 +1,4 @@
+- Add interactive support for comic #2288
+- Vibration on long click now follows Android system settings
+- Fix image loading when high resolution comics not available
+- Fix xk3d #826 loaded as interactive comic

fastlane/metadata/android/zh-CN/changelogs/2.7.4.txt → fastlane/metadata/android/zh-CN/changelogs/2.7.5.txt

@@ -1,2 +1,4 @@
+- 支持 #2288 篇交互型漫画
 - 长按图片震动现遵循系统设置
-- 修复部分漫画在无对应高清版本时加载失败的问题
+- 修复部分漫画在无对应高清版本时加载失败的问题
+- 修复 #826 篇 xk3d 以交互型漫画打开的问题

fastlane/metadata/android/zh-HK/changelogs/2.7.4.txt → fastlane/metadata/android/zh-HK/changelogs/2.7.5.txt

@@ -1,2 +1,4 @@
+- 支持 #2288 篇交互型漫畫
 - 長按圖片震動現遵循系統設置
-- 修復部分漫畫在無對應高清版本時加載失敗的問題
+- 修復部分漫畫在無對應高清版本時加載失敗的問題
+- 修復 #826 篇 xk3d 以交互型漫畫打開的問題

fastlane/metadata/android/zh-TW/changelogs/2.7.4.txt → fastlane/metadata/android/zh-TW/changelogs/2.7.5.txt

@@ -1,2 +1,4 @@
+- 支持 #2288 篇交互型漫畫
 - 長按圖片震動現遵循系統設置
-- 修復部分漫畫在無對應高清版本時加載失敗的問題
+- 修復部分漫畫在無對應高清版本時加載失敗的問題
+- 修復 #826 篇 xk3d 以交互型漫畫打開的問題

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 15 11:14:51 CST 2019
+#Mon Apr 06 22:32:22 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

xkcd/build.gradle

@@ -7,7 +7,7 @@ if (isProprietary) {
 }
 apply plugin: 'com.android.application'
 if (isProprietary) {
-    apply plugin: 'io.fabric'
+    apply plugin: 'com.google.firebase.crashlytics'
 }
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -69,8 +69,8 @@ android {
         applicationId "xyz.jienan.xkcd"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 67
-        versionName "2.7.4"
+        versionCode 68
+        versionName "2.7.5"
         vectorDrawables.useSupportLibrary = true
         resConfigs "de", "es", "fr", "ru", "b+zh", "b+zh+hant+TW"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -121,7 +121,11 @@ android {
             testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project-test.pro'
             applicationIdSuffix ".debug"
             multiDexEnabled false
-            ext.enableCrashlytics = false
+            if (isProprietary) {
+                firebaseCrashlytics {
+                    mappingFileUploadEnabled false
+                }
+            }
         }
 
         release {
@@ -180,8 +184,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.media:media:1.1.0'
-    implementation 'androidx.exifinterface:exifinterface:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha01'
+    implementation 'androidx.exifinterface:exifinterface:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha02'
     implementation 'com.google.android.material:material:1.2.0-alpha05'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation 'org.jsoup:jsoup:1.12.1'
@@ -215,9 +219,9 @@ dependencies {
 
     fossImplementation "androidx.work:work-runtime-ktx:2.3.4"
     fossImplementation "androidx.work:work-rxjava2:2.3.4"
-    proprietaryImplementation 'com.google.firebase:firebase-analytics:17.2.3'
-    proprietaryImplementation 'com.google.firebase:firebase-messaging:20.1.3'
-    proprietaryImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
+    proprietaryImplementation 'com.google.firebase:firebase-analytics:17.3.0'
+    proprietaryImplementation 'com.google.firebase:firebase-messaging:20.1.5'
+    proprietaryImplementation 'com.google.firebase:firebase-crashlytics:17.0.0-beta03'
 
 //    implementation 'androidx.slice:slice-core:1.0.0'
 //    implementation 'androidx.slice:slice-builders:1.0.0'

xkcd/src/proprietary/java/xyz/jienan/xkcd/FlavorUtils.kt

@@ -1,7 +1,7 @@
 package xyz.jienan.xkcd
 
 import android.app.Application
-import com.crashlytics.android.Crashlytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.messaging.FirebaseMessaging
 import java.util.*
 
@@ -20,7 +20,8 @@ object FlavorUtils {
 
     fun updateLocale() {
         if (!BuildConfig.DEBUG) {
-            Crashlytics.setString("locale", Locale.getDefault().toString())
+            FirebaseCrashlytics.getInstance()
+                    .setCustomKey("locale", Locale.getDefault().toString())
         }
     }
 }