Skip to content

Commit

Permalink
Update Gradle notation for dependencies and plugins
Browse files Browse the repository at this point in the history
* don't let the build fail on linter issues
* update gradle build tools, slf4j for Android and OSMDroid
  • Loading branch information
floscher committed Jan 27, 2018
1 parent fff913d commit 3c616b0
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 14 deletions.
31 changes: 18 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
apply plugin: 'com.android.application'
plugins {
id 'com.android.application'
}

android {
compileSdkVersion 16
buildToolsVersion "22.0.1"
buildToolsVersion "27.0.3"

defaultConfig {
applicationId "me.guillaumin.android.osmtracker"
minSdkVersion 8
targetSdkVersion 16
multiDexEnabled true

testApplicationId "me.guillaumin.android.osmtracker.test"
testInstrumentationRunner "android.test.InstrumentationTestRunner"
}

signingConfigs {


// Create a file $HOME/.gradle/gradle.properties
// containing the values signing.storeFile=..., etc.
if (project.hasProperty('signing.storeFile')) {
Expand All @@ -41,21 +42,25 @@ android {
}

packagingOptions {
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
}

android {
lintOptions {
abortOnError false
}
}
}

dependencies {
compile 'org.apache.james:apache-mime4j-core:0.7.2'
compile 'org.apache.httpcomponents:httpclient:4.2.1'
compile 'org.apache.httpcomponents:httpcore:4.2.1'
compile 'org.apache.httpcomponents:httpmime:4.2.1'
compile 'org.osmdroid:osmdroid-android:5.5:release@aar'
compile 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
compile 'oauth.signpost:signpost-core:1.2.1.2'
compile 'org.slf4j:slf4j-android:1.6.1-RC1'
implementation 'org.apache.james:apache-mime4j-core:0.7.2'
implementation 'org.apache.httpcomponents:httpclient:4.2.1'
implementation 'org.apache.httpcomponents:httpcore:4.2.1'
implementation 'org.apache.httpcomponents:httpmime:4.2.1'
implementation 'org.osmdroid:osmdroid-android:5.6.5'
implementation 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
implementation 'org.slf4j:slf4j-android:1.7.25'
}

task copyNorwegianValues(type: Copy) {
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.android.tools.build:gradle:3.0.1'
}
}

allprojects {
repositories {
google()
jcenter()
}
}

0 comments on commit 3c616b0

Please sign in to comment.