clean up some build config

rcgroot · Mar 13, 2017 · 2c76950 · 2c76950
1 parent 03a3cb3
commit 2c76950
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/studio/app/build.gradle b/studio/app/build.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.android.application'
+apply plugin: 'jacoco'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'com.vanniktech.android.junit.jacoco'
 
-junitJacoco {
-    jacocoVersion = jacocoVersion
+jacoco {
+    toolVersion = jacocoVersion
 }
 
 android {
@@ -61,10 +61,6 @@ android {
         enabled = true
     }
 
-    kapt {
-        generateStubs = true
-    }
-
     lintOptions {
         disable 'InvalidPackage'
         abortOnError false

diff --git a/...app/src/main/java/nl/sogeti/android/gpstracker/ng/common/controllers/ContentController.kt b/...app/src/main/java/nl/sogeti/android/gpstracker/ng/common/controllers/ContentController.kt
@@ -36,7 +36,7 @@ class ContentController(val context: Context, val listener: ContentListener) {
         fun unregister() {
             if (registeredUri != null) {
                 context.contentResolver.unregisterContentObserver(contentObserver)
-                registeredUri = null4§
+                registeredUri = null
             }
         }
 

diff --git a/studio/build.gradle b/studio/build.gradle
@@ -4,24 +4,17 @@ buildscript {
 
     repositories {
         jcenter()
-        maven {
-            url 'https://dl.bintray.com/kotlin/kotlin-eap'
-        }
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$rootProject.gradlePluginVersion"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.kotlinVersion"
-        classpath "com.vanniktech:gradle-android-junit-jacoco-plugin:$rootProject.jacocoPluginVersion"
         classpath "com.google.gms:google-services:$rootProject.googleServicesVersion"
     }
 }
 
 allprojects {
     repositories {
         jcenter()
-        maven {
-            url 'https://dl.bintray.com/kotlin/kotlin-eap'
-        }
     }
 }
 

diff --git a/studio/versions.gradle b/studio/versions.gradle
@@ -15,8 +15,7 @@ ext {
     googleServicesVersion = '3.0.0'
 
     // Testing
-    jacocoPluginVersion = '0.5.0'
-    jacocoVersion = '0.7.8'
+    jacocoVersion = '0.7.9'
     junitVersion = '4.12'
     mockitoVersion = '2.2.20'
     testRunnerVersion = '0.5'