Merge pull request #11 from Kaufland/#UpdateGradlePlugin

#Updated gradle plugin to the latest version.
SchwarzIT · Nov 23, 2017 · 049bdd5 · 049bdd5
2 parents 3820ef1 + 1960a14
commit 049bdd5
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 50 deletions.
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,10 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-26.0.1
+    - build-tools-26.0.2
 
     # The SDK version used to compile your project
-    - android-26
+    - android-27
 
     - extra-android-m2repository
     - extra-google-m2repository   

diff --git a/build.gradle b/build.gradle
@@ -2,23 +2,22 @@
 
 buildscript {
     ext {
-        androidSupportVersion = '26.0.2'
-        androidBuildToolsVersion = '26.0.1'
+        androidSupportVersion = '27.0.1'
         jUnitVersion = '4.12'
     }
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'org.jacoco:org.jacoco.core:0.7.9'
     }
 }
 
 allprojects {
     repositories {
+        google()
         jcenter()
         maven {
             url "https://maven.google.com"

diff --git a/demo/build.gradle b/demo/build.gradle
@@ -1,8 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "${androidBuildToolsVersion}"
+    compileSdkVersion 27
 
 
     lintOptions {
@@ -11,7 +10,7 @@ android {
     defaultConfig {
         applicationId "kaufland.com.demo"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
 
@@ -27,13 +26,13 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile "com.android.support:appcompat-v7:${androidSupportVersion}"
-    compile "com.android.support:recyclerview-v7:${androidSupportVersion}"
-    compile "com.android.support:design:${androidSupportVersion}"
-    testCompile "junit:junit:${jUnitVersion}"
-    compile project(path: ':library')
+    implementation "com.android.support:appcompat-v7:${androidSupportVersion}"
+    implementation "com.android.support:recyclerview-v7:${androidSupportVersion}"
+    implementation "com.android.support:design:${androidSupportVersion}"
+    testImplementation "junit:junit:${jUnitVersion}"
+    implementation project(path: ':library')
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Mar 31 11:39:23 CEST 2017
+#Thu Nov 23 17:19:09 EET 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/library/build.gradle b/library/build.gradle
@@ -1,15 +1,13 @@
 apply plugin: 'com.android.library'
-apply plugin: 'android-apt'
 apply plugin: 'maven'
 apply plugin: 'jacoco'
 apply plugin: 'pmd'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "${androidBuildToolsVersion}"
+    compileSdkVersion 27
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -28,16 +26,12 @@ android {
     }
     testOptions {
         unitTests.returnDefaultValues = true
-        unitTests.all {
-            jacoco {
-                includeNoLocationClasses = true
-            }
-        }
     }
 }
 
 buildscript {
     repositories {
+        google()
         mavenCentral()
         maven { url 'https://maven.fabric.io/public' }
         maven { url uri('libs') }
@@ -50,15 +44,8 @@ buildscript {
     }
 }
 
-apt {
-    arguments {
-        library 'true'
-        androidManifestFile variant.outputs[0]?.processResources?.manifestFile
-    }
-}
-
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.3.3'
+    gradleVersion = '3.0.1'
 }
 
 task jacocoTestReport(type: JacocoReport, dependsOn: 'testDebugUnitTest', group: 'verification') {
@@ -78,19 +65,19 @@ task jacocoTestReport(type: JacocoReport, dependsOn: 'testDebugUnitTest', group:
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile "com.android.support:appcompat-v7:${androidSupportVersion}"
-    apt "org.androidannotations:androidannotations:4.3.1"
-    compile 'org.androidannotations:androidannotations-api:4.3.1'
-    testCompile "junit:junit:${jUnitVersion}"
-    testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile 'org.powermock:powermock-module-junit4:1.6.3'
-    testCompile 'org.powermock:powermock-module-junit4-rule:1.6.3'
-    testCompile 'org.powermock:powermock-api-mockito:1.6.3'
-    testCompile 'org.powermock:powermock-classloading-xstream:1.6.3'
-    testCompile 'org.robolectric:robolectric:3.2.2'
-    testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
+    implementation "com.android.support:appcompat-v7:${androidSupportVersion}"
+    annotationProcessor "org.androidannotations:androidannotations:4.3.1"
+    implementation 'org.androidannotations:androidannotations-api:4.3.1'
+    testImplementation "junit:junit:${jUnitVersion}"
+    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.powermock:powermock-module-junit4:1.6.3'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.3'
+    testImplementation 'org.powermock:powermock-api-mockito:1.6.3'
+    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.3'
+    testImplementation 'org.robolectric:robolectric:3.2.2'
+    testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
 }