Skip to content

Commit

Permalink
Beta fixes (#21)
Browse files Browse the repository at this point in the history
* Fix network error string and autosize text

* Allow android studio to build signed release
  • Loading branch information
robert-w-gries committed Jan 30, 2019
1 parent 84be2d8 commit 685b8ec
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Built application files
*.apk
*.ap_
*.aab

# Files for the ART/Dalvik VM
*.dex
Expand Down Expand Up @@ -62,4 +63,7 @@ fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md
fastlane/readme.md

# keystores
*.jks
12 changes: 11 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
}
}
Expand All @@ -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"
Expand Down

0 comments on commit 685b8ec

Please sign in to comment.