From 685b8ec16826b735883a7d758dfbbac27f5a2a7b Mon Sep 17 00:00:00 2001
From: Rob Gries <robert.w.gries@gmail.com>
Date: Tue, 29 Jan 2019 22:58:50 -0500
Subject: [PATCH] Beta fixes (#21)

* Fix network error string and autosize text

* Allow android studio to build signed release
---
 .gitignore       |  6 +++++-
 app/build.gradle | 12 +++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c117df..8d62573 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Built application files
 *.apk
 *.ap_
+*.aab
 
 # Files for the ART/Dalvik VM
 *.dex
@@ -62,4 +63,7 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
-fastlane/readme.md
\ No newline at end of file
+fastlane/readme.md
+
+# keystores
+*.jks
diff --git a/app/build.gradle b/app/build.gradle
index 7c2f1ae..c40f31a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,6 +9,14 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlinx-serialization'
 
 android {
+    signingConfigs {
+        config {
+            storeFile file(store_file)
+            storePassword store_password
+            keyAlias key_alias
+            keyPassword key_password
+        }
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -28,11 +36,13 @@ android {
     buildTypes {
         debug {
             resValue 'string', "api_key", pantries_android_maps_key
+            signingConfig signingConfigs.config
         }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             resValue 'string', "api_key", pantries_android_maps_key
+            signingConfig signingConfigs.config
         }
     }
 }
@@ -51,7 +61,7 @@ repositories {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "android.arch.lifecycle:extensions:$lifecycle_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"