Skip to content

Commit 8e30cff

Browse files
author
Nicolas
authored
Merge pull request #33 from timeforcoffee/update-build-tool
Update android gradle buildtool to 3.0.0
2 parents 3a82409 + d8792f5 commit 8e30cff

File tree

8 files changed

+56
-54
lines changed

8 files changed

+56
-54
lines changed

‎api/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ android {
2424
}
2525

2626
dependencies {
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
28-
compile 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
29-
compile 'com.google.code.gson:gson:2.3.1'
30-
compile 'com.squareup.dagger:dagger:' + project.DAGGER_VERSION
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
28+
api project(':opendata')
29+
api project(':zvv')
30+
31+
api 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
32+
api 'org.greenrobot:eventbus:3.0.0'
33+
api 'com.github.jd-alexander:library:1.0.5'
34+
implementation 'com.google.code.gson:gson:2.3.1'
35+
implementation 'com.squareup.dagger:dagger:' + project.DAGGER_VERSION
36+
implementation 'com.google.android.gms:play-services-location:' + project.PLAY_SERVICES_VERSION
3137

32-
compile 'org.greenrobot:eventbus:3.0.0'
33-
34-
compile 'com.google.android.gms:play-services-location:' + project.PLAY_SERVICES_VERSION
35-
compile 'com.github.jd-alexander:library:1.0.5'
36-
compile project(':opendata')
37-
compile project(':zvv')
3838
}

‎build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
google()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.0'
9+
classpath 'com.android.tools.build:gradle:3.0.0'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
@@ -38,5 +39,6 @@ ext {
3839
allprojects {
3940
repositories {
4041
jcenter()
42+
google()
4143
}
4244
}

‎common/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ android {
1919
}
2020

2121
dependencies {
22-
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile project(':api')
24-
22+
implementation fileTree(dir: 'libs', include: ['*.jar'])
23+
implementation project(':api')
2524
}

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Oct 30 09:58:29 CET 2017
1+
#Tue Nov 14 14:22:48 CET 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

‎mobile/build.gradle

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ buildscript {
77
classpath 'io.fabric.tools:gradle:1.+'
88
}
99
}
10+
1011
apply plugin: 'com.android.application'
1112
apply plugin: 'io.fabric'
1213

@@ -50,29 +51,30 @@ dependencies {
5051
repositories {
5152
mavenCentral()
5253
}
53-
compile fileTree(dir: 'libs', include: ['*.jar'])
54+
55+
annotationProcessor 'com.squareup.dagger:dagger-compiler:' + project.DAGGER_VERSION
56+
implementation fileTree(dir: 'libs', include: ['*.jar'])
57+
5458
wearApp project(':wear')
55-
provided 'com.squareup.dagger:dagger-compiler:' + project.DAGGER_VERSION
56-
compile project(':opendata')
57-
compile project(':api')
58-
compile project(':common')
59+
implementation project(':opendata')
60+
implementation project(':api')
61+
implementation project(':common')
5962

60-
compile 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
61-
compile 'com.android.support:support-v4:' + project.SUPPORT_VERSION
62-
compile 'com.android.support:design:' + project.SUPPORT_VERSION
63-
compile 'com.google.android.gms:play-services-wearable:' + project.PLAY_SERVICES_VERSION
64-
compile 'com.google.android.gms:play-services-maps:' + project.PLAY_SERVICES_VERSION
65-
compile 'io.reactivex:rxjava:' + project.RXJAVA_VERSION
66-
compile 'io.reactivex:rxandroid:' + project.RXANDROID_VERSION
67-
compile 'com.squareup.dagger:dagger:' + project.DAGGER_VERSION
68-
compile 'com.sothree.slidinguppanel:library:3.0.0'
69-
compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
63+
implementation 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
64+
implementation 'com.android.support:support-v4:' + project.SUPPORT_VERSION
65+
implementation 'com.android.support:design:' + project.SUPPORT_VERSION
66+
implementation 'com.google.android.gms:play-services-wearable:' + project.PLAY_SERVICES_VERSION
67+
implementation 'com.google.android.gms:play-services-maps:' + project.PLAY_SERVICES_VERSION
68+
implementation 'io.reactivex:rxjava:' + project.RXJAVA_VERSION
69+
implementation 'io.reactivex:rxandroid:' + project.RXANDROID_VERSION
70+
implementation 'com.squareup.dagger:dagger:' + project.DAGGER_VERSION
71+
implementation 'com.sothree.slidinguppanel:library:3.0.0'
72+
implementation 'com.astuetz:pagerslidingtabstrip:1.0.1'
7073

71-
compile('io.nlopez.smartlocation:library:3.2.7') {
74+
implementation('io.nlopez.smartlocation:library:3.2.7') {
7275
transitive = false
7376
}
74-
compile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
77+
implementation('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
7578
transitive = true;
7679
}
77-
7880
}

‎opendata/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ android {
2020
}
2121

2222
dependencies {
23-
compile fileTree(include: ['*.jar'], dir: 'libs')
24-
compile 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
25-
compile 'com.squareup.retrofit:retrofit:' + project.RETROFIT_VERSION
26-
compile 'io.reactivex:rxjava:' + project.RXJAVA_VERSION
27-
compile 'io.reactivex:rxandroid:' + project.RXANDROID_VERSION
23+
implementation fileTree(include: ['*.jar'], dir: 'libs')
24+
implementation 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
25+
api 'com.squareup.retrofit:retrofit:' + project.RETROFIT_VERSION
26+
api 'io.reactivex:rxjava:' + project.RXJAVA_VERSION
27+
api 'io.reactivex:rxandroid:' + project.RXANDROID_VERSION
2828
}

‎wear/build.gradle

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,16 @@ android {
2525
}
2626

2727
dependencies {
28-
compile fileTree(dir: 'libs', include: ['*.jar'])
28+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2929

30-
compile project(':opendata')
31-
compile project(':api')
32-
compile project(':common')
30+
implementation project(':opendata')
31+
implementation project(':api')
32+
implementation project(':common')
3333

34-
compile 'com.google.android.gms:play-services-location:' +project.PLAY_SERVICES_VERSION
35-
compile 'com.google.android.gms:play-services-wearable:' +project.PLAY_SERVICES_VERSION
36-
compile 'com.google.android.gms:play-services-maps:' +project.PLAY_SERVICES_VERSION
37-
compile 'com.android.support:support-v13:' +project.SUPPORT_VERSION
38-
39-
compile 'com.google.android.support:wearable:' +project.SUPPORT_WEARABLE_VERSION
34+
implementation 'com.google.android.gms:play-services-location:' + project.PLAY_SERVICES_VERSION
35+
implementation 'com.google.android.gms:play-services-wearable:' + project.PLAY_SERVICES_VERSION
36+
implementation 'com.google.android.gms:play-services-maps:' + project.PLAY_SERVICES_VERSION
37+
implementation 'com.android.support:support-v13:' + project.SUPPORT_VERSION
38+
implementation 'com.google.android.support:wearable:' + project.SUPPORT_WEARABLE_VERSION
4039

4140
}

‎zvv/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ android {
1919
}
2020

2121
dependencies {
22-
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
24-
compile 'com.squareup.retrofit:retrofit:' + project.RETROFIT_VERSION
25-
compile 'io.reactivex:rxjava:' + project.RXJAVA_VERSION
26-
compile 'io.reactivex:rxandroid:' + project.RXANDROID_VERSION
22+
implementation fileTree(dir: 'libs', include: ['*.jar'])
23+
implementation 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
24+
api 'com.squareup.retrofit:retrofit:' + project.RETROFIT_VERSION
25+
api 'io.reactivex:rxjava:' + project.RXJAVA_VERSION
26+
api 'io.reactivex:rxandroid:' + project.RXANDROID_VERSION
2727
}

0 commit comments

Comments
 (0)