Handle warnings for all supported versions of Gradle

Author: ghale

src/main/groovy/org/gradle/android/AndroidCacheFixPlugin.groovy

@@ -16,8 +16,7 @@ import org.gradle.android.workarounds.Workaround
 import org.gradle.android.workarounds.WorkaroundContext
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.services.BuildService
-import org.gradle.api.services.BuildServiceParameters
+import org.gradle.util.GradleVersion
 import org.gradle.util.VersionNumber
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -82,7 +81,13 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
             appliedWorkarounds += workaround.getClass().simpleName - "Workaround"
         }
 
-        project.gradle.sharedServices.registerIfAbsent("warnings", WarningsService.class) { }.get()
+        if (GradleVersion.current() >= GradleVersion.version('6.1')) {
+            project.gradle.sharedServices.registerIfAbsent("warnings", WarningsService.class) {}.get()
+        } else {
+            project.gradle.buildFinished {
+                Warnings.resetAll()
+            }
+        }
     }
 
     static List<Workaround> getWorkaroundsToApply(
@@ -115,11 +120,4 @@ class AndroidCacheFixPlugin implements Plugin<Project> {
         }
         workaroundsBuilder.build()
     }
-
-    abstract static class WarningsService implements BuildService<BuildServiceParameters.None>, AutoCloseable {
-        @Override
-        void close() throws Exception {
-            Warnings.values().each {it.reset() }
-        }
-    }
 }

src/main/groovy/org/gradle/android/Warnings.groovy

@@ -6,7 +6,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 
 enum Warnings {
     MAYBE_SUPPORTED_ANDROID_VERSION("WARNING: Android plugin ${Versions.CURRENT_ANDROID_VERSION} has not been tested with this version of the Android cache fix plugin, although it may work.  We test against only the latest patch release versions of Android Gradle plugin: ${Versions.SUPPORTED_ANDROID_VERSIONS.join(", ")}.  If ${Versions.CURRENT_ANDROID_VERSION} is newly released, we may not have had a chance to release a version tested against it yet.  Proceed with caution.  You can suppress this warning with with -D${Versions.IGNORE_VERSION_CHECK_PROPERTY}=true."),
-    USE_COMPILE_LIBRARY_RESOURCES_EXPERIMENTAL("WARNING: Android plugin ${Versions.CURRENT_ANDROID_VERSION} has experimental support for using relative path sensitivity with CompileLibraryResourcesTask inputs which will provide more build cache hits and will improve build speed.  Set '${CompileLibraryResourcesWorkaround_7_0.CACHE_COMPILE_LIB_RESOURCES}=true' and '${CompileLibraryResourcesWorkaround_7_0.ENABLE_SOURCE_SET_PATHS_MAP}=true' in gradle.properties to enable this support.")
+    USE_COMPILE_LIBRARY_RESOURCES_EXPERIMENTAL("WARNING: Android plugin ${Versions.CURRENT_ANDROID_VERSION} has experimental support for using relative path sensitivity with CompileLibraryResourcesTask inputs which will provide more build cache hits and improve build speed.  Set '${CompileLibraryResourcesWorkaround_7_0.CACHE_COMPILE_LIB_RESOURCES}=true' and '${CompileLibraryResourcesWorkaround_7_0.ENABLE_SOURCE_SET_PATHS_MAP}=true' in gradle.properties to enable this support.")
 
     final String warning
     private final AtomicBoolean warned = new AtomicBoolean()
@@ -24,4 +24,8 @@ enum Warnings {
     void reset() {
         warned.set(false)
     }
+
+    static void resetAll() {
+        values().each {it.reset() }
+    }
 }

src/main/groovy/org/gradle/android/WarningsService.groovy

@@ -0,0 +1,11 @@
+package org.gradle.android
+
+import org.gradle.api.services.BuildService
+import org.gradle.api.services.BuildServiceParameters
+
+abstract class WarningsService implements BuildService<BuildServiceParameters.None>, AutoCloseable {
+    @Override
+    void close() throws Exception {
+        Warnings.resetAll()
+    }
+}