Drop support for versions lower than 6.6

Author: deepy

src/main/kotlin/com/github/gradle/node/NodePlugin.kt

@@ -122,9 +122,7 @@ class NodePlugin : Plugin<Project> {
             content {
                 includeModule("org.nodejs", "node")
             }
-            if (GradleVersion.current() >= GradleVersion.version("6.0")) {
-                allowInsecureProtocol?.let { isAllowInsecureProtocol = it }
-            }
+            allowInsecureProtocol?.let { isAllowInsecureProtocol = it }
         }
     }
 

src/main/kotlin/com/github/gradle/node/PackageJsonExtension.kt

@@ -17,9 +17,7 @@ open class PackageJsonExtension(project: Project) {
     val node = project.objects.property<JsonNode>()
 
     init {
-        if (GradleVersion.current() >= GradleVersion.version("6.1")) {
-            node.finalizeValueOnRead()
-        }
+        node.finalizeValueOnRead()
         node.set(project.provider { project.file("package.json").let(ObjectMapper()::readTree) })
     }
 

src/main/kotlin/com/github/gradle/node/util/ProjectApiHelper.kt

@@ -14,6 +14,7 @@ import org.gradle.util.GradleVersion
 import java.io.File
 import javax.inject.Inject
 
+@Deprecated(message = "Only 6.6 and newer is supported")
 interface ProjectApiHelper {
     companion object {
         @JvmStatic
@@ -26,7 +27,7 @@ interface ProjectApiHelper {
         }
 
         private fun enableConfigurationCache(): Boolean {
-            return GradleVersion.current() >= GradleVersion.version("6.6")
+            return true
         }
     }
 

src/test/resources/fixtures/node-env/build.gradle

@@ -58,8 +58,5 @@ task version(type: NodeTask) {
 }
 
 def isPropertyEnabled(String name) {
-    if (GradleVersion.current() >= GradleVersion.version("6.6")) {
-        return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
-    }
-    return System.properties[name] != null
+    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
 }

src/test/resources/fixtures/node/build.gradle

@@ -43,8 +43,5 @@ task version(type: NodeTask) {
 }
 
 def isPropertyEnabled(String name) {
-    if (GradleVersion.current() >= GradleVersion.version("6.6")) {
-        return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
-    }
-    return System.properties[name] != null
+    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
 }

src/test/resources/fixtures/npm-env/build.gradle

@@ -60,8 +60,5 @@ if (isPropertyEnabled("outputFile")) {
 }
 
 def isPropertyEnabled(String name) {
-    if (GradleVersion.current() >= GradleVersion.version("6.6")) {
-        return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
-    }
-    return System.properties[name] != null
+    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
 }

src/test/resources/fixtures/npm/build.gradle

@@ -30,8 +30,5 @@ task version(type: NpmTask) {
 }
 
 def isPropertyEnabled(String name) {
-    if (GradleVersion.current() >= GradleVersion.version("6.6")) {
-        return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
-    }
-    return System.properties[name] != null
+    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
 }

src/test/resources/fixtures/npx-env/build.gradle

@@ -69,8 +69,5 @@ if (isPropertyEnabled("outputFile")) {
 }
 
 def isPropertyEnabled(String name) {
-    if (GradleVersion.current() >= GradleVersion.version("6.6")) {
-        return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
-    }
-    return System.properties[name] != null
+    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
 }

src/test/resources/fixtures/npx/build.gradle

@@ -60,8 +60,5 @@ if (isPropertyEnabled("changeInputs")) {
 }
 
 def isPropertyEnabled(String name) {
-    if (GradleVersion.current() >= GradleVersion.version("6.6")) {
-        return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
-    }
-    return System.properties[name] != null
+    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
 }

src/test/resources/fixtures/pnpm-env/build.gradle

@@ -59,8 +59,5 @@ if (isPropertyEnabled("outputFile")) {
 }
 
 def isPropertyEnabled(String name) {
-    if (GradleVersion.current() >= GradleVersion.version("6.6")) {
-        return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
-    }
-    return System.properties[name] != null
+    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
 }

src/test/resources/fixtures/pnpm/build.gradle

@@ -30,8 +30,5 @@ task version(type: PnpmTask) {
 }
 
 def isPropertyEnabled(String name) {
-    if (GradleVersion.current() >= GradleVersion.version("6.6")) {
-        return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
-    }
-    return System.properties[name] != null
+    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
 }

src/test/resources/fixtures/yarn-env/build.gradle

@@ -60,8 +60,5 @@ if (isPropertyEnabled("outputFile")) {
 }
 
 def isPropertyEnabled(String name) {
-    if (GradleVersion.current() >= GradleVersion.version("6.6")) {
-        return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
-    }
-    return System.properties[name] != null
+    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
 }

src/test/resources/fixtures/yarn/build.gradle

@@ -31,8 +31,5 @@ task version(type: YarnTask) {
 }
 
 def isPropertyEnabled(String name) {
-    if (GradleVersion.current() >= GradleVersion.version("6.6")) {
-        return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
-    }
-    return System.properties[name] != null
+    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
 }