diff --git a/build.gradle b/build.gradle
index 54b9f9b86..88554f8d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,10 +39,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
-
 /**
  * Improve build server performance by allowing disabling of pre-dexing
  * (see http://tools.android.com/tech-docs/new-build-system/tips#TOC-Improving-Build-Server-performance.)
@@ -122,107 +118,112 @@ allprojects {
  * Publishing and signing info
  */
 subprojects { project ->
-    if (project.ext.artifactId == null) return
-
-    apply plugin: 'com.android.library'
-    apply plugin: 'com.hiya.jacoco-android'
-    apply plugin: 'maven-publish'
-    apply plugin: 'signing'
-
-    // Code coverage
-    jacoco {
-        toolVersion = "0.8.4"
-    }
-
-    tasks.withType(Test) {
-        jacoco.includeNoLocationClasses = true
-        jacoco.excludes = ['jdk.internal.*']
-    }
+    project.plugins.withId('com.android.library') {
+        if (project.ext.artifactId == null) return
+
+        // FIXME > Failed to apply plugin [id 'com.hiya.jacoco-android']
+        //   > You must apply the Android plugin or the Android library plugin before using the jacoco-android plugin
+        //apply plugin: 'com.hiya.jacoco-android'
+        apply plugin: 'maven-publish'
+        apply plugin: 'signing'
+
+        // Code coverage
+//        jacoco {
+//            toolVersion = "0.8.4"
+//        }
+//
+//        tasks.withType(Test) {
+//            jacoco.includeNoLocationClasses = true
+//            jacoco.excludes = ['jdk.internal.*']
+//        }
+
+        task javadoc(type: Javadoc) {
+            failOnError false
+            source = android.sourceSets.main.java.srcDirs
+        }
 
-    task javadoc(type: Javadoc) {
-        failOnError false
-        source = android.sourceSets.main.java.srcDirs
-    }
+        task sourcesJar(type: Jar) {
+            from android.sourceSets.main.java.srcDirs
+            classifier = 'sources'
+        }
 
-    task sourcesJar(type: Jar) {
-        from android.sourceSets.main.java.srcDirs
-        classifier = 'sources'
-    }
+        task javadocJar(type: Jar, dependsOn: javadoc) {
+            classifier = 'javadoc'
+            from javadoc.destinationDir
+        }
 
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = 'javadoc'
-        from javadoc.destinationDir
-    }
+        publishing {
+            publications {
+                aar(MavenPublication) {
+                    groupId project.group
+                    artifactId project.ext.artifactId
+                    version project.version
+
+                    pom {
+                        name = project.ext.artifactId
+                        description = 'Handy extensions to the Google Maps Android API.'
+                        url = 'https://github.com/googlemaps/android-maps-utils'
+
+                        scm {
+                            url = 'scm:git@github.com:googlemaps/android-maps-utils.git'
+                            connection = 'scm:git@github.com:googlemaps/android-maps-utils.git'
+                            developerConnection = 'scm:git@github.com:googlemaps/android-maps-utils.git'
+                        }
 
-    publishing {
-        publications {
-            aar(MavenPublication) {
-                groupId project.group
-                artifactId project.ext.artifactId
-                version project.version
-
-                pom {
-                    name = project.ext.artifactId
-                    description = 'Handy extensions to the Google Maps Android API.'
-                    url = 'https://github.com/googlemaps/android-maps-utils'
-
-                    scm {
-                        url = 'scm:git@github.com:googlemaps/android-maps-utils.git'
-                        connection = 'scm:git@github.com:googlemaps/android-maps-utils.git'
-                        developerConnection = 'scm:git@github.com:googlemaps/android-maps-utils.git'
-                    }
+                        licenses {
+                            license {
+                                name = 'The Apache Software License, Version 2.0'
+                                url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                                distribution = 'repo'
+                            }
+                        }
 
-                    licenses {
-                        license {
-                            name = 'The Apache Software License, Version 2.0'
-                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                            distribution = 'repo'
+                        organization {
+                            name = 'Google Inc'
+                            url = 'http://developers.google.com/maps'
                         }
-                    }
 
-                    organization {
-                        name = 'Google Inc'
-                        url = 'http://developers.google.com/maps'
+                        developers {
+                            developer {
+                                name = 'Google Inc.'
+                            }
+                        }
                     }
 
-                    developers {
-                        developer {
-                            name = 'Google Inc.'
+                    pom.withXml {
+                        def dependenciesNode = asNode().appendNode('dependencies')
+                        project.configurations.api.allDependencies.each { dependency ->
+                            def dependencyNode = dependenciesNode.appendNode('dependency')
+                            dependencyNode.appendNode('groupId', dependency.group)
+                            dependencyNode.appendNode('artifactId', dependency.name)
+                            dependencyNode.appendNode('version', dependency.version)
                         }
                     }
-                }
 
-                pom.withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    project.configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
+                    afterEvaluate {
+                        artifact "$buildDir/outputs/aar/$project.name-release.aar"
+                        artifact sourcesJar
+                        artifact javadocJar
                     }
                 }
-
-                afterEvaluate {
-                    artifact "$buildDir/outputs/aar/$project.name-release.aar"
-                    artifact sourcesJar
-                    artifact javadocJar
-                }
             }
-        }
 
-        repositories {
-            maven {
-                name = "mavencentral"
-                url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-                credentials {
-                    username sonatypeUsername
-                    password sonatypePassword
+            repositories {
+                maven {
+                    name = "mavencentral"
+                    url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+                    credentials {
+                        username sonatypeUsername
+                        password sonatypePassword
+                    }
                 }
             }
         }
-    }
 
-    signing {
-        sign publishing.publications.aar
+        // FIXME - Failed to apply plugin [id 'com.android.library']
+        //   > Cannot add task 'signAarPublication' as a task with that name already exists.
+//        signing {
+//            sign publishing.publications.aar
+//        }
     }
 }
diff --git a/library-v3/build.gradle b/library-v3/build.gradle
index 9193acd35..c319d7f2b 100644
--- a/library-v3/build.gradle
+++ b/library-v3/build.gradle
@@ -5,6 +5,7 @@
  * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus. 
  * Vestibulum commodo. Ut rhoncus gravida arcu. 
  */
+apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 29
diff --git a/library/build.gradle b/library/build.gradle
index 31c2b74dd..4fe862537 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+apply plugin: 'com.android.library'
+
 android {
     dexOptions {
         javaMaxHeapSize "2g"