Skip to content

Commit

Permalink
Merge branch 'master' of github.com:descartae/android
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasmontano committed Aug 21, 2018
2 parents 275ffe8 + 17c18b5 commit 3ec66f3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ android {
compileSdkVersion 27
defaultConfig {
applicationId "com.descartae"
minSdkVersion 23
minSdkVersion 19
targetSdkVersion 27
versionCode 6
versionName "1.0.1"
versionCode 7
versionName "1.0.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
buildConfigField "String", "MOBILE_API_URL", project.MOBILE_API_DEBUG
Expand Down Expand Up @@ -55,7 +55,7 @@ dependencies {
implementation 'com.google.android.gms:play-services-maps:15.0.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.google.firebase:firebase-core:16.0.1'
implementation 'com.google.firebase:firebase-perf:16.0.0'
implementation 'com.google.firebase:firebase-perf:16.1.0'
implementation 'com.google.firebase:firebase-appindexing:16.0.1'
implementation 'com.google.code.gson:gson:2.8.2'
implementation 'com.squareup.picasso:picasso:2.71828'
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ org.gradle.jvmargs=-Xmx1536m
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

MOBILE_API_DEBUG="http://beta-api.descartae.com/graphql"
MOBILE_API_RELEASE="http://api.descartae.com/graphql"
MOBILE_API_DEBUG="https://api.descartae.com/graphql"
MOBILE_API_RELEASE="https://api.descartae.com/graphql"

0 comments on commit 3ec66f3

Please sign in to comment.