Skip to content

Commit fb1fcff

Browse files
authored
Merge pull request #131 from floscher/gradle_update
Update Gradle to version 4.5, update dependency versions and fix Travis build
2 parents 73e3f41 + 23cb335 commit fb1fcff

7 files changed

Lines changed: 77 additions & 63 deletions

File tree

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ jdk: oraclejdk8
55

66
android:
77
components:
8-
- build-tools-22.0.1
8+
- tools
9+
- platform-tools
10+
- tools
11+
- build-tools-27.0.3
912
- android-16
13+
- android-19
1014
- sys-img-armeabi-v7a-android-19
1115

1216
before_script:
13-
- echo no | android create avd --force -n test -c 100M -t android-16 --abi armeabi-v7a
17+
- echo no | android create avd --force -n test -c 100M -t android-19 --abi armeabi-v7a
1418
- emulator -avd test -no-audio -no-window &
1519
- android-wait-for-emulator
1620
- adb shell input keyevent 82 &
21+
- android list targets

app/build.gradle

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
apply plugin: 'com.android.application'
1+
plugins {
2+
id 'com.android.application'
3+
}
24

35
android {
46
compileSdkVersion 16
5-
buildToolsVersion "22.0.1"
7+
buildToolsVersion "27.0.3"
68

79
defaultConfig {
810
applicationId "org.osmtracker"
911
minSdkVersion 8
1012
targetSdkVersion 16
13+
multiDexEnabled true
1114

1215
testApplicationId "org.osmtracker.test"
1316
testInstrumentationRunner "android.test.InstrumentationTestRunner"
1417
}
1518

1619
signingConfigs {
17-
18-
1920
// Create a file $HOME/.gradle/gradle.properties
2021
// containing the values signing.storeFile=..., etc.
2122
if (project.hasProperty('signing.storeFile')) {
@@ -41,21 +42,25 @@ android {
4142
}
4243

4344
packagingOptions {
45+
exclude 'META-INF/DEPENDENCIES'
4446
exclude 'META-INF/LICENSE.txt'
4547
exclude 'META-INF/NOTICE.txt'
4648
}
47-
49+
android {
50+
lintOptions {
51+
abortOnError false
52+
}
53+
}
4854
}
4955

5056
dependencies {
51-
compile 'org.apache.james:apache-mime4j-core:0.7.2'
52-
compile 'org.apache.httpcomponents:httpclient:4.2.1'
53-
compile 'org.apache.httpcomponents:httpcore:4.2.1'
54-
compile 'org.apache.httpcomponents:httpmime:4.2.1'
55-
compile 'org.osmdroid:osmdroid-android:5.5:release@aar'
56-
compile 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
57-
compile 'oauth.signpost:signpost-core:1.2.1.2'
58-
compile 'org.slf4j:slf4j-android:1.6.1-RC1'
57+
implementation 'org.apache.james:apache-mime4j-core:0.7.2'
58+
implementation 'org.apache.httpcomponents:httpclient:4.2.1'
59+
implementation 'org.apache.httpcomponents:httpcore:4.2.1'
60+
implementation 'org.apache.httpcomponents:httpmime:4.2.1'
61+
implementation 'org.osmdroid:osmdroid-android:5.6.5'
62+
implementation 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
63+
implementation 'org.slf4j:slf4j-android:1.7.25'
5964
}
6065

6166
task copyNorwegianValues(type: Copy) {

build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
repositories {
4+
google()
45
jcenter()
56
}
67
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.2.2'
8+
classpath 'com.android.tools.build:gradle:3.0.1'
89
}
910
}
1011

1112
allprojects {
1213
repositories {
14+
google()
1315
jcenter()
1416
}
1517
}

gradle/wrapper/gradle-wrapper.jar

4.33 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Nov 19 17:50:46 PST 2016
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip
6+
distributionSha256Sum=6ac2f8f9302f50241bf14cc5f4a3d88504ad20e61bb98c5fd048f7723b61397e

gradlew

Lines changed: 43 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 4 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)