From 2b7b86da9601ac346bfab361a4e1cfe7ddc6933c Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Sun, 8 Nov 2020 18:11:56 +0900
Subject: [PATCH] fixed gallery import

---
 app/build.gradle                 | 25 +++++++++++++------------
 app/release/output-metadata.json |  4 ++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 95abdd3a..f805b686 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 apply plugin: "kotlin-kapt"
-apply plugin: "kotlin-parcelize"
+apply plugin: "kotlin-android-extensions"
 apply plugin: "kotlinx-serialization"
 apply plugin: "com.google.android.gms.oss-licenses-plugin"
 
-if (file("google-services.json").exists()) {
+if (file("google-services.json").exists() && file("src/debug/google-services.json").exists()) {
     logger.lifecycle("Firebase Enabled")
     apply plugin: "com.google.gms.google-services"
     apply plugin: "com.google.firebase.crashlytics"
@@ -37,8 +37,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 64
-        versionName "5.1.7-beta1"
+        versionCode 63
+        versionName "5.1.6-hotfix7-alpha5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -63,9 +63,6 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
     }
-    buildFeatures {
-        viewBinding true
-    }
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
         freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
@@ -80,8 +77,8 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0"
     
     implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.activity:activity-ktx:1.2.0-beta01"
@@ -95,12 +92,12 @@ dependencies {
 
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
 
-    implementation "com.google.android.material:material:1.3.0-alpha04"
+    implementation "com.google.android.material:material:1.3.0-alpha03"
 
     implementation "com.google.firebase:firebase-core:18.0.0"
     implementation "com.google.firebase:firebase-analytics:18.0.0"
-    implementation "com.google.firebase:firebase-crashlytics:17.3.0"
-    implementation "com.google.firebase:firebase-perf:19.0.10"
+    implementation "com.google.firebase:firebase-crashlytics:17.2.2"
+    implementation "com.google.firebase:firebase-perf:19.0.9"
 
     implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
     implementation "com.google.android.gms:play-services-mlkit-face-detection:16.1.1"
@@ -135,4 +132,8 @@ dependencies {
     androidTestImplementation "androidx.test:rules:1.3.0"
     androidTestImplementation "androidx.test:runner:1.3.0"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
+}
+
+androidExtensions {
+    experimental = true
 }
\ No newline at end of file
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index a03bfc40..56b52b68 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 64,
-      "versionName": "5.1.7-beta1",
+      "versionCode": 63,
+      "versionName": "5.1.6-hotfix7-alpha5",
       "outputFile": "app-release.apk"
     }
   ]