From a1c34fe732180d3de0faef9b9203e0331a77acc2 Mon Sep 17 00:00:00 2001
From: Karn Saheb <saheb.karn@live.com>
Date: Fri, 31 May 2019 22:03:42 -0400
Subject: [PATCH] Remove redundant gradle configuration.

---
 build.gradle         | 37 +++++++++++++++++--------------------
 library/build.gradle | 19 +++----------------
 sample/build.gradle  |  4 ++--
 3 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/build.gradle b/build.gradle
index 123096b..8ac4093 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,35 +1,32 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 group = 'io.karn'
 
-subprojects {
+buildscript {
     apply from: rootProject.file('gradle/configuration.gradle')
 
-    buildscript {
-
-        repositories {
-            google()
-            jcenter()
-            maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
-        }
+    repositories {
+        google()
+        jcenter()
+    }
 
-        dependencies {
-            classpath config.build.gradle.androidPlugin
-            classpath config.build.gradle.kotlin
+    dependencies {
+        classpath config.build.gradle.androidPlugin
+        classpath config.build.gradle.kotlin
 
-            // NOTE: Do not place your application configuration here; they belong
-            // in the individual module build.gradle files
-            classpath config.build.gradle.androidMaven
-            // Code coverage
-            classpath config.build.gradle.jacoco
-            // Library documentation
-            classpath config.build.gradle.dokka
-        }
+        // NOTE: Do not place your application configuration here; they belong
+        // in the individual module build.gradle files
+        classpath config.build.gradle.androidMaven
+        // Code coverage
+        classpath config.build.gradle.jacoco
+        // Library documentation
+        classpath config.build.gradle.dokka
     }
+}
 
+subprojects {
     repositories {
         google()
         jcenter()
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
     }
 }
 
diff --git a/library/build.gradle b/library/build.gradle
index 3931544..f746bb3 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -58,9 +58,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
-        abortOnError false
-    }
+    lintOptions.abortOnError false
 
     testOptions {
         unitTests {
@@ -69,13 +67,6 @@ android {
     }
 }
 
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
-}
-
 dependencies {
     implementation config.deps.kotlin.stdlib
 
@@ -85,9 +76,7 @@ dependencies {
     testImplementation config.testDeps.robolectric
 }
 
-jacoco {
-    toolVersion = config.build.jacocoAgentVersion
-}
+jacoco.toolVersion = config.build.jacocoAgentVersion
 
 tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
@@ -104,9 +93,7 @@ task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
 }
 
-artifacts {
-    archives sourcesJar
-}
+artifacts.archives sourcesJar
 
 /**
  * Adapted from https://medium.com/@rafael_toledo/unified-code-coverage-for-android-revisited-44789c9b722f
diff --git a/sample/build.gradle b/sample/build.gradle
index 527d3c3..a7dbca0 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -52,9 +52,9 @@ dependencies {
     implementation project(path: ':library')
 }
 
-// Skip teting and linting.
+// Skip testing and linting.
 tasks.whenTaskAdded { task ->
-    if (task.name.equals("lint") || task.name.contains("Test")) {
+    if (task.name == "lint" || task.name.contains("Test")) {
         task.enabled = false
     }
 }