Skip to content

Commit

Permalink
Update gradle and gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
coderworld10 committed Feb 21, 2018
1 parent 344fe56 commit f0e2aef
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 21 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*.iml
.gradle
gradle.properties
/local.properties
/.idea/workspace.xml
/.idea/libraries
Expand All @@ -8,3 +9,4 @@
/captures
.externalNativeBuild
.idea
proto/build
19 changes: 15 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,23 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlinx-serialization'

android {
compileSdkVersion 26
compileSdkVersion 27
defaultConfig {
applicationId "com.navirice.android"
minSdkVersion 21
targetSdkVersion 26
targetSdkVersion 27
multiDexEnabled true
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes.each {
it.buildConfigField 'String', 'MAP_BOX_API_ACCESS_TOKEN', MapBoxAPIAccessToken
it.resValue 'string', 'rendering_server_ip', RenderingServerIP
it.resValue 'string', 'rendering_server_port', RenderingServerPort
it.resValue 'string', 'google_maps_key', (project.findProperty('GOOGLE_MAPS_API_KEY') ?: '')
}

buildTypes {
release {
minifyEnabled false
Expand All @@ -31,9 +39,10 @@ repositories {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support:design:26.1.0'
implementation 'com.android.support:design:27.0.2'
implementation 'com.google.android.gms:play-services-maps:11.8.0'
implementation 'com.google.android.gms:play-services-location:11.8.0'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'io.reactivex.rxjava2:rxjava:2.1.5'
Expand All @@ -44,6 +53,8 @@ dependencies {
implementation 'com.github.kittinunf.fuel:fuel-android:1.12.0'
implementation 'com.github.kittinunf.fuel:fuel-jackson:1.12.0'
implementation 'com.google.android.gms:play-services-location:11.8.0'
implementation 'com.mapbox.mapboxsdk:mapbox-android-navigation:0.9.0'

compile "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serialization_version"
compile project(':proto')
testImplementation 'junit:junit:4.12'
Expand Down
17 changes: 0 additions & 17 deletions gradle.properties

This file was deleted.

0 comments on commit f0e2aef

Please sign in to comment.