Gradle and Gradle plugins update (#121)

Author: labkey-susanh

build.gradle

@@ -10,13 +10,12 @@ buildscript {
             }
         }
         maven {
-            url "${artifactory_contextUrl}/plugins-release-no-proxy"
+            url = "${artifactory_contextUrl}/plugins-release-no-proxy"
             mavenContent {
                 releasesOnly()
             }
             content {
                 includeGroup "org.labkey.build"
-                includeGroup "org.labkey.versioning"
             }
         }
         if (gradlePluginsVersion.contains("SNAPSHOT"))
@@ -29,7 +28,6 @@ buildscript {
                 }
                 content {
                     includeGroup "org.labkey.build"
-                    includeGroup "org.labkey.versioning"
                 }
             }
 
@@ -51,8 +49,8 @@ String rExe = InstallRPackage.getRPath()
 
 project.tasks.register("check") {
     Task task ->
-        group GroupNames.VERIFICATION
-        description "Run validation checks on the Rlabkey package"
+        group = GroupNames.VERIFICATION
+        description = "Run validation checks on the Rlabkey package"
         task.outputs.dir project.layout.buildDirectory.file("Rlabkey.Rcheck")
         task.outputs.dir project.file("Rlabkey/src-i386")
         task.outputs.dir project.file("Rlabkey/src-x64")
@@ -66,7 +64,7 @@ project.tasks.register("check") {
                 }
             })
             if (existingFiles.length > 0) {
-                project.ant.exec(
+                task.ant.exec(
                         executable: rExe,
                         output: buildOutputFile,
                         append: true,
@@ -84,22 +82,22 @@ project.tasks.register("check") {
 
 project.tasks.register("build") {
     Task task ->
-        task.group GroupNames.BUILD
-        task.description "Build the Rlabkey package that can be installed and tested in R. Builds binary package on windows, source only on unix"
+        task.group = GroupNames.BUILD
+        task.description = "Build the Rlabkey package that can be installed and tested in R. Builds binary package on windows, source only on unix"
         task.inputs.files project.fileTree(dir: "Rlabkey", excludes: ["src-i386", "src-x64"]).files
-        task.outputs.dir project.layout.buildDirectory
+        task.inputs.property("directory", "${project.projectDir}/Rlabkey")
+        task.outputs.dir BuildUtils.getBuildDir(project)
         task.doFirst(
                 {
-                    BuildUtils.getBuildDir(project).mkdirs()
-                    project.ant.exec(
+                    task.ant.exec(
                             executable: rExe,
-                            dir: BuildUtils.getBuildDir(project),
+                            dir: outputs.files.singleFile,
                             output: buildOutputFile,
                             append: true,
                             logError: true
                     )
                             {
-                                arg(line: "CMD build ${project.projectDir}/Rlabkey")
+                                arg(line: "CMD build ${task.inputs.properties.get("directory")}")
                                 if (rLibsUserPath != null)
                                     env(key: "R_LIBS_USER", value: rLibsUserPath)
                             }
@@ -109,8 +107,8 @@ project.tasks.register("build") {
 
 
 project.tasks.register("clean", Delete) {
-        group GroupNames.BUILD
-        description "Deletes all non-versioned files generated during the build process"
+        group = GroupNames.BUILD
+        description = "Deletes all non-versioned files generated during the build process"
         delete project.tasks.check
         delete project.tasks.build
 }

gradle.properties

@@ -1,2 +1,2 @@
 artifactory_contextUrl=https://labkey.jfrog.io/artifactory
-gradlePluginsVersion=1.43.0
+gradlePluginsVersion=7.2.0

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists