Upgrade to Gradle 7.4

graalvm · Feb 9, 2022 · db27b0c · db27b0c
1 parent e9b7cbb
commit db27b0c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/native-gradle-plugin.yml b/.github/workflows/native-gradle-plugin.yml
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gradle-version: ["current", "7.3", "7.2", "7.1", "6.8.3","6.7.1"]
+        gradle-version: ["current", "7.3.3", "7.2", "7.1", "6.8.3","6.7.1"]
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/common/junit-platform-native/gradle/wrapper/gradle-wrapper.properties b/common/junit-platform-native/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/native-gradle-plugin/buildSrc/src/main/groovy/org.graalvm.build.functional-testing.gradle b/native-gradle-plugin/buildSrc/src/main/groovy/org.graalvm.build.functional-testing.gradle
@@ -81,7 +81,7 @@ def graalVm = javaToolchains.launcherFor {
 def fullFunctionalTest = tasks.register("fullFunctionalTest")
 
 ['functionalTest', 'configCacheFunctionalTest'].each { baseName ->
-    ["current", "7.3", "7.2", "7.1", "6.8.3", "6.7.1"].each { gradleVersion ->
+    ["current", "7.3.3", "7.2", "7.1", "6.8.3", "6.7.1"].each { gradleVersion ->
         String taskName = gradleVersion == 'current' ? baseName : "gradle${gradleVersion}${baseName.capitalize()}"
         // Add a task to run the functional tests
         def testTask = tasks.register(taskName, Test) {

diff --git a/native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...ve-maven-plugin/build-plugins/src/main/kotlin/org.graalvm.build.maven-embedder.gradle.kts b/...ve-maven-plugin/build-plugins/src/main/kotlin/org.graalvm.build.maven-embedder.gradle.kts
@@ -1,4 +1,3 @@
-import gradle.kotlin.dsl.accessors._c82c258a19f3f9db84b385a71a3d54fd.testFixturesImplementation
 import org.gradle.kotlin.dsl.creating
 import org.gradle.kotlin.dsl.getValue
 import org.gradle.kotlin.dsl.invoke
@@ -45,9 +44,6 @@ import org.gradle.kotlin.dsl.invoke
  */
 
 val mavenEmbedder by configurations.creating
+val testFixturesImplementation by configurations.getting
 
-configurations {
-    testFixturesImplementation {
-        extendsFrom(mavenEmbedder)
-    }
-}
+testFixturesImplementation.extendsFrom(mavenEmbedder)
diff --git a/native-maven-plugin/gradle/wrapper/gradle-wrapper.properties b/native-maven-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists