Merge pull request #33 from timeforcoffee/update-build-tool

Update android gradle buildtool to 3.0.0
timeforcoffee · Nov 17, 2017 · 8e30cff · 8e30cff
2 parents 3a82409 + d8792f5
commit 8e30cff
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 54 deletions.
diff --git a/api/build.gradle b/api/build.gradle
@@ -24,15 +24,15 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
-    compile 'com.google.code.gson:gson:2.3.1'
-    compile 'com.squareup.dagger:dagger:' + project.DAGGER_VERSION
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    api project(':opendata')
+    api project(':zvv')
+
+    api 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
+    api 'org.greenrobot:eventbus:3.0.0'
+    api 'com.github.jd-alexander:library:1.0.5'
+    implementation 'com.google.code.gson:gson:2.3.1'
+    implementation 'com.squareup.dagger:dagger:' + project.DAGGER_VERSION
+    implementation 'com.google.android.gms:play-services-location:' + project.PLAY_SERVICES_VERSION
 
-    compile 'org.greenrobot:eventbus:3.0.0'
-
-    compile 'com.google.android.gms:play-services-location:' + project.PLAY_SERVICES_VERSION
-    compile 'com.github.jd-alexander:library:1.0.5'
-    compile project(':opendata')
-    compile project(':zvv')
 }
diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:3.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -38,5 +39,6 @@ ext {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -19,7 +19,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':api')
-
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':api')
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Oct 30 09:58:29 CET 2017
+#Tue Nov 14 14:22:48 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -7,6 +7,7 @@ buildscript {
         classpath 'io.fabric.tools:gradle:1.+'
     }
 }
+
 apply plugin: 'com.android.application'
 apply plugin: 'io.fabric'
 
@@ -50,29 +51,30 @@ dependencies {
     repositories {
         mavenCentral()
     }
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+
+    annotationProcessor 'com.squareup.dagger:dagger-compiler:' + project.DAGGER_VERSION
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
     wearApp project(':wear')
-    provided 'com.squareup.dagger:dagger-compiler:' + project.DAGGER_VERSION
-    compile project(':opendata')
-    compile project(':api')
-    compile project(':common')
+    implementation project(':opendata')
+    implementation project(':api')
+    implementation project(':common')
 
-    compile 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
-    compile 'com.android.support:support-v4:' + project.SUPPORT_VERSION
-    compile 'com.android.support:design:' + project.SUPPORT_VERSION
-    compile 'com.google.android.gms:play-services-wearable:' + project.PLAY_SERVICES_VERSION
-    compile 'com.google.android.gms:play-services-maps:' + project.PLAY_SERVICES_VERSION
-    compile 'io.reactivex:rxjava:' + project.RXJAVA_VERSION
-    compile 'io.reactivex:rxandroid:' + project.RXANDROID_VERSION
-    compile 'com.squareup.dagger:dagger:' + project.DAGGER_VERSION
-    compile 'com.sothree.slidinguppanel:library:3.0.0'
-    compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
+    implementation 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
+    implementation 'com.android.support:support-v4:' + project.SUPPORT_VERSION
+    implementation 'com.android.support:design:' + project.SUPPORT_VERSION
+    implementation 'com.google.android.gms:play-services-wearable:' + project.PLAY_SERVICES_VERSION
+    implementation 'com.google.android.gms:play-services-maps:' + project.PLAY_SERVICES_VERSION
+    implementation 'io.reactivex:rxjava:' + project.RXJAVA_VERSION
+    implementation 'io.reactivex:rxandroid:' + project.RXANDROID_VERSION
+    implementation 'com.squareup.dagger:dagger:' + project.DAGGER_VERSION
+    implementation 'com.sothree.slidinguppanel:library:3.0.0'
+    implementation 'com.astuetz:pagerslidingtabstrip:1.0.1'
 
-    compile('io.nlopez.smartlocation:library:3.2.7') {
+    implementation('io.nlopez.smartlocation:library:3.2.7') {
         transitive = false
     }
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
+    implementation('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
         transitive = true;
     }
-
 }
diff --git a/opendata/build.gradle b/opendata/build.gradle
@@ -20,9 +20,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
-    compile 'com.squareup.retrofit:retrofit:' + project.RETROFIT_VERSION
-    compile 'io.reactivex:rxjava:' + project.RXJAVA_VERSION
-    compile 'io.reactivex:rxandroid:' + project.RXANDROID_VERSION
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
+    api 'com.squareup.retrofit:retrofit:' + project.RETROFIT_VERSION
+    api 'io.reactivex:rxjava:' + project.RXJAVA_VERSION
+    api 'io.reactivex:rxandroid:' + project.RXANDROID_VERSION
 }
diff --git a/wear/build.gradle b/wear/build.gradle
@@ -25,17 +25,16 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile project(':opendata')
-    compile project(':api')
-    compile project(':common')
+    implementation project(':opendata')
+    implementation project(':api')
+    implementation project(':common')
 
-    compile 'com.google.android.gms:play-services-location:' +project.PLAY_SERVICES_VERSION
-    compile 'com.google.android.gms:play-services-wearable:' +project.PLAY_SERVICES_VERSION
-    compile 'com.google.android.gms:play-services-maps:' +project.PLAY_SERVICES_VERSION
-    compile 'com.android.support:support-v13:' +project.SUPPORT_VERSION
-
-    compile 'com.google.android.support:wearable:' +project.SUPPORT_WEARABLE_VERSION
+    implementation 'com.google.android.gms:play-services-location:' + project.PLAY_SERVICES_VERSION
+    implementation 'com.google.android.gms:play-services-wearable:' + project.PLAY_SERVICES_VERSION
+    implementation 'com.google.android.gms:play-services-maps:' + project.PLAY_SERVICES_VERSION
+    implementation 'com.android.support:support-v13:' + project.SUPPORT_VERSION
+    implementation 'com.google.android.support:wearable:' + project.SUPPORT_WEARABLE_VERSION
 
 }
diff --git a/zvv/build.gradle b/zvv/build.gradle
@@ -19,9 +19,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
-    compile 'com.squareup.retrofit:retrofit:' + project.RETROFIT_VERSION
-    compile 'io.reactivex:rxjava:' + project.RXJAVA_VERSION
-    compile 'io.reactivex:rxandroid:' + project.RXANDROID_VERSION
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:' + project.SUPPORT_VERSION
+    api 'com.squareup.retrofit:retrofit:' + project.RETROFIT_VERSION
+    api 'io.reactivex:rxjava:' + project.RXJAVA_VERSION
+    api 'io.reactivex:rxandroid:' + project.RXANDROID_VERSION
 }