Introduce DeprecationLoggerUtils to assist with Gradle DeprecationLog…

…ger package change

src/main/groovy/com/netflix/nebula/lint/plugin/FixGradleLintTask.groovy

@@ -29,7 +29,6 @@ import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.VerificationTask
-import org.gradle.util.DeprecationLogger
 
 import static com.netflix.nebula.lint.StyledTextService.Styling.*
 

src/main/groovy/com/netflix/nebula/lint/plugin/GradleLintReportTask.groovy

@@ -17,6 +17,7 @@ package com.netflix.nebula.lint.plugin
 
 import com.netflix.nebula.lint.GradleLintPatchAction
 import com.netflix.nebula.lint.StyledTextService
+import com.netflix.nebula.lint.utils.DeprecationLoggerUtils
 import org.codenarc.AnalysisContext
 import org.codenarc.report.HtmlReportWriter
 import org.codenarc.report.ReportWriter
@@ -35,13 +36,12 @@ import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Nested
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.VerificationTask
-import org.gradle.util.DeprecationLogger
 import org.gradle.internal.reflect.Instantiator
 import org.gradle.util.GradleVersion
 
 import javax.inject.Inject
 
-import static com.netflix.nebula.lint.StyledTextService.Styling.*
+import static com.netflix.nebula.lint.StyledTextService.Styling.Bold
 
 class GradleLintReportTask extends DefaultTask implements VerificationTask, Reporting<CodeNarcReports> {
 
@@ -57,11 +57,11 @@ class GradleLintReportTask extends DefaultTask implements VerificationTask, Repo
 
     GradleLintReportTask() {
         CodeNarcReportsImpl codeNarcReports
-        if(GradleVersion.version(project.gradle.gradleVersion).compareTo(GradleVersion.version('4.4.1')) > 0) {
+        if (GradleVersion.version(project.gradle.gradleVersion).compareTo(GradleVersion.version('4.4.1')) > 0) {
             codeNarcReports = project.objects.newInstance(CodeNarcReportsImpl.class, this)
         } else {
             //TODO: remove this once we don't have customers in Gradle 4.1
-            DeprecationLogger.whileDisabled() {
+            DeprecationLoggerUtils.whileDisabled() {
                 codeNarcReports = instantiator.newInstance(CodeNarcReportsImpl, this)
             }
         }

src/main/groovy/com/netflix/nebula/lint/utils/DeprecationLoggerUtils.groovy

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015-2019 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.netflix.nebula.lint.utils
+
+import groovy.transform.CompileDynamic
+import org.gradle.api.GradleException
+import org.gradle.util.GradleVersion
+
+import java.lang.reflect.InvocationTargetException
+
+@CompileDynamic
+class DeprecationLoggerUtils {
+    private static final String LEGACY_DEPRECATION_LOGGER_CLASS = 'org.gradle.util.DeprecationLogger'
+    private static final String DEPRECATION_LOGGER_CLASS = 'org.gradle.internal.deprecation.DeprecationLogger'
+
+    static void whileDisabled(Runnable action) {
+        String gradleDeprecationLoggerClassName = (GradleVersion.current() >= GradleVersion.version('6.2') || GradleVersion.current().version.startsWith('6.2')) ? DEPRECATION_LOGGER_CLASS : LEGACY_DEPRECATION_LOGGER_CLASS
+        try {
+            Class clazz = Class.forName(gradleDeprecationLoggerClassName)
+            clazz.getMethod("whileDisabled", Runnable).invoke(this, action)
+        } catch (ClassNotFoundException e) {
+            throw new GradleException("Could not execute whileDisabled runnable action for $gradleDeprecationLoggerClassName | $e.message", e)
+        } catch (InvocationTargetException e) {
+            throw e.targetException
+        }
+    }
+}