Gate forUseAtConfigurationTime usage in tests with Gradle version

deepy · deepy · commit f327f5ae4580 · 2023-07-24T21:10:53.000+02:00
diff --git a/src/test/resources/fixtures/node-env/build.gradle b/src/test/resources/fixtures/node-env/build.gradle
@@ -58,5 +58,10 @@ task version(type: NodeTask) {
 }
 
 def isPropertyEnabled(String name) {
-    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
+    def provider = providers.systemProperty(name)
+    if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {
+        return provider.isPresent()
+    } else {
+        return provider.forUseAtConfigurationTime().isPresent()
+    }
 }
diff --git a/src/test/resources/fixtures/node/build.gradle b/src/test/resources/fixtures/node/build.gradle
@@ -43,5 +43,10 @@ task version(type: NodeTask) {
 }
 
 def isPropertyEnabled(String name) {
-    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
+    def provider = providers.systemProperty(name)
+    if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {
+        return provider.isPresent()
+    } else {
+        return provider.forUseAtConfigurationTime().isPresent()
+    }
 }
diff --git a/src/test/resources/fixtures/npm-env/build.gradle b/src/test/resources/fixtures/npm-env/build.gradle
@@ -60,5 +60,10 @@ if (isPropertyEnabled("outputFile")) {
 }
 
 def isPropertyEnabled(String name) {
-    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
+    def provider = providers.systemProperty(name)
+    if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {
+        return provider.isPresent()
+    } else {
+        return provider.forUseAtConfigurationTime().isPresent()
+    }
 }
diff --git a/src/test/resources/fixtures/npm/build.gradle b/src/test/resources/fixtures/npm/build.gradle
@@ -30,5 +30,10 @@ task version(type: NpmTask) {
 }
 
 def isPropertyEnabled(String name) {
-    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
+    def provider = providers.systemProperty(name)
+    if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {
+        return provider.isPresent()
+    } else {
+        return provider.forUseAtConfigurationTime().isPresent()
+    }
 }
diff --git a/src/test/resources/fixtures/npx-env/build.gradle b/src/test/resources/fixtures/npx-env/build.gradle
@@ -70,5 +70,10 @@ if (isPropertyEnabled("outputFile")) {
 }
 
 def isPropertyEnabled(String name) {
-    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
+    def provider = providers.systemProperty(name)
+    if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {
+        return provider.isPresent()
+    } else {
+        return provider.forUseAtConfigurationTime().isPresent()
+    }
 }
diff --git a/src/test/resources/fixtures/npx/build.gradle b/src/test/resources/fixtures/npx/build.gradle
@@ -60,5 +60,10 @@ if (isPropertyEnabled("changeInputs")) {
 }
 
 def isPropertyEnabled(String name) {
-    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
+    def provider = providers.systemProperty(name)
+    if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {
+        return provider.isPresent()
+    } else {
+        return provider.forUseAtConfigurationTime().isPresent()
+    }
 }
diff --git a/src/test/resources/fixtures/pnpm-env/build.gradle b/src/test/resources/fixtures/pnpm-env/build.gradle
@@ -59,5 +59,10 @@ if (isPropertyEnabled("outputFile")) {
 }
 
 def isPropertyEnabled(String name) {
-    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
+    def provider = providers.systemProperty(name)
+    if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {
+        return provider.isPresent()
+    } else {
+        return provider.forUseAtConfigurationTime().isPresent()
+    }
 }
diff --git a/src/test/resources/fixtures/pnpm/build.gradle b/src/test/resources/fixtures/pnpm/build.gradle
@@ -30,5 +30,10 @@ task version(type: PnpmTask) {
 }
 
 def isPropertyEnabled(String name) {
-    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
+    def provider = providers.systemProperty(name)
+    if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {
+        return provider.isPresent()
+    } else {
+        return provider.forUseAtConfigurationTime().isPresent()
+    }
 }
diff --git a/src/test/resources/fixtures/yarn-env/build.gradle b/src/test/resources/fixtures/yarn-env/build.gradle
@@ -60,5 +60,10 @@ if (isPropertyEnabled("outputFile")) {
 }
 
 def isPropertyEnabled(String name) {
-    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
+    def provider = providers.systemProperty(name)
+    if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {
+        return provider.isPresent()
+    } else {
+        return provider.forUseAtConfigurationTime().isPresent()
+    }
 }
diff --git a/src/test/resources/fixtures/yarn/build.gradle b/src/test/resources/fixtures/yarn/build.gradle
@@ -31,5 +31,10 @@ task version(type: YarnTask) {
 }
 
 def isPropertyEnabled(String name) {
-    return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()
+    def provider = providers.systemProperty(name)
+    if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {
+        return provider.isPresent()
+    } else {
+        return provider.forUseAtConfigurationTime().isPresent()
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -58,5 +58,10 @@ task version(type: NodeTask) {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`def isPropertyEnabled(String name) {`
`61`		`- return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()`
	`61`	`+ def provider = providers.systemProperty(name)`
	`62`	`+ if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {`
	`63`	`+ return provider.isPresent()`
	`64`	`+ } else {`
	`65`	`+ return provider.forUseAtConfigurationTime().isPresent()`
	`66`	`+ }`
`62`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,10 @@ task version(type: NodeTask) {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`def isPropertyEnabled(String name) {`
`46`		`- return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()`
	`46`	`+ def provider = providers.systemProperty(name)`
	`47`	`+ if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {`
	`48`	`+ return provider.isPresent()`
	`49`	`+ } else {`
	`50`	`+ return provider.forUseAtConfigurationTime().isPresent()`
	`51`	`+ }`
`47`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,10 @@ if (isPropertyEnabled("outputFile")) {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`def isPropertyEnabled(String name) {`
`63`		`- return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()`
	`63`	`+ def provider = providers.systemProperty(name)`
	`64`	`+ if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {`
	`65`	`+ return provider.isPresent()`
	`66`	`+ } else {`
	`67`	`+ return provider.forUseAtConfigurationTime().isPresent()`
	`68`	`+ }`
`64`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,10 @@ task version(type: NpmTask) {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`def isPropertyEnabled(String name) {`
`33`		`- return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()`
	`33`	`+ def provider = providers.systemProperty(name)`
	`34`	`+ if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {`
	`35`	`+ return provider.isPresent()`
	`36`	`+ } else {`
	`37`	`+ return provider.forUseAtConfigurationTime().isPresent()`
	`38`	`+ }`
`34`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,5 +70,10 @@ if (isPropertyEnabled("outputFile")) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`def isPropertyEnabled(String name) {`
`73`		`- return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()`
	`73`	`+ def provider = providers.systemProperty(name)`
	`74`	`+ if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {`
	`75`	`+ return provider.isPresent()`
	`76`	`+ } else {`
	`77`	`+ return provider.forUseAtConfigurationTime().isPresent()`
	`78`	`+ }`
`74`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,10 @@ if (isPropertyEnabled("outputFile")) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`def isPropertyEnabled(String name) {`
`62`		`- return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()`
	`62`	`+ def provider = providers.systemProperty(name)`
	`63`	`+ if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {`
	`64`	`+ return provider.isPresent()`
	`65`	`+ } else {`
	`66`	`+ return provider.forUseAtConfigurationTime().isPresent()`
	`67`	`+ }`
`63`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,10 @@ task version(type: PnpmTask) {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`def isPropertyEnabled(String name) {`
`33`		`- return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()`
	`33`	`+ def provider = providers.systemProperty(name)`
	`34`	`+ if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {`
	`35`	`+ return provider.isPresent()`
	`36`	`+ } else {`
	`37`	`+ return provider.forUseAtConfigurationTime().isPresent()`
	`38`	`+ }`
`34`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,10 @@ task version(type: YarnTask) {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`def isPropertyEnabled(String name) {`
`34`		`- return providers.systemProperty(name).forUseAtConfigurationTime().isPresent()`
	`34`	`+ def provider = providers.systemProperty(name)`
	`35`	`+ if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("7.4")) {`
	`36`	`+ return provider.isPresent()`
	`37`	`+ } else {`
	`38`	`+ return provider.forUseAtConfigurationTime().isPresent()`
	`39`	`+ }`
`35`	`40`	`}`