Merge pull request #1610 from synthetichealth/fix-gradle-deprecation-warnings

Upgrade gradle and fix deprecation warnings

Author: jawalonoski

build.gradle

@@ -1,37 +1,52 @@
 /*
  * This file defines the steps to build Synthea using Gradle. Full documentation of the syntax
- * can be found at https://docs.gradle.org/6.5/userguide/java_plugin.html
+ * can be found at https://docs.gradle.org/8.14/userguide/java_plugin.html
  */
 
 buildscript {
   repositories {
+    mavenCentral()
+  }
+  dependencies {
+    classpath 'com.gradleup.shadow:shadow-gradle-plugin:8.3.9'
+  }
+}
+
+buildscript {
+  repositories {
+    mavenCentral()
     maven {
-      url "https://plugins.gradle.org/m2/"
+      url = "https://oss.sonatype.org/content/repositories/snapshots"
     }
   }
   dependencies {
-    classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
+    // commons-io used in getting the version id below
+    classpath group: 'commons-io', name: 'commons-io', version: '2.5'
+    // note that commons-io is already a dependency
+    // of commons-csv in the primary dependencies above
   }
 }
-apply plugin: "com.github.johnrengelman.shadow"
-
-// Apply the java plugin to add support for Java
-apply plugin: 'java'
 
-sourceCompatibility = '11'
+plugins {
+  id 'java'
+  id 'com.gradleup.shadow' version '8.3.9'
+  id 'application'
+  id 'eclipse'
+  id 'checkstyle'
+  id 'jacoco'
+  id 'maven-publish'
+  id 'signing'
+}
 
-apply plugin: 'application'
-apply plugin: 'eclipse'
-apply plugin: 'checkstyle'
-apply plugin: 'jacoco'
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
+java {
+  sourceCompatibility = '11'
+}
 
 // In this section you declare where to find the dependencies of your project
 repositories {
   mavenCentral()
   maven {
-    url "https://oss.sonatype.org/content/repositories/snapshots"
+    url = "https://oss.sonatype.org/content/repositories/snapshots"
   }
 }
 
@@ -41,12 +56,12 @@ repositories {
 // }
 
 checkstyle {
-  toolVersion '8.4'
+  toolVersion = '8.4'
   //showViolations = true
 }
 
 jacoco {
-  toolVersion '0.8.7'
+  toolVersion = '0.8.7'
 }
 
 dependencies {
@@ -155,21 +170,6 @@ test {
   }
 }
 
-buildscript {
-  repositories {
-    mavenCentral()
-    maven {
-      url "https://oss.sonatype.org/content/repositories/snapshots"
-    }
-  }
-  dependencies {
-    // commons-io used in getting the version id below
-    classpath group: 'commons-io', name: 'commons-io', version: '2.5'
-    // note that commons-io is already a dependency
-    // of commons-csv in the primary dependencies above
-  }
-}
-
 jacocoTestReport {
   reports {
     xml.required = true
@@ -180,8 +180,8 @@ jacocoTestReport {
 check.dependsOn jacocoTestReport
 
 task graphviz(type: JavaExec) {
-  group 'Application'
-  description 'Generate rule visualization'
+  group = 'Application'
+  description = 'Generate rule visualization'
   classpath sourceSets.main.runtimeClasspath
   mainClass = "Graphviz"
 }
@@ -200,15 +200,15 @@ tasks.javadoc {
 }
 
 task rifMinimize(type: JavaExec) {
-  group 'Application'
-  description 'Filter exported RIF files to produce minimal set that covers all claim types'
+  group = 'Application'
+  description = 'Filter exported RIF files to produce minimal set that covers all claim types'
   classpath sourceSets.main.runtimeClasspath
   mainClass = "org.mitre.synthea.export.rif.tools.BB2RIFMinimizer"
 }
 
 task rif2CCW(type: JavaExec) {
-  group 'Application'
-  description 'Convert exported RIF files from BB2 format to CCW format'
+  group = 'Application'
+  description = 'Convert exported RIF files from BB2 format to CCW format'
   classpath sourceSets.main.runtimeClasspath
   mainClass = "org.mitre.synthea.export.rif.tools.BB2RIF2CCW"
 }
@@ -219,15 +219,15 @@ if (project.hasProperty("args")) {
     ext.cmdLineArgs = ""
 }
 task rifBeneSplit(type: JavaExec) {
-  group 'Application'
-  description 'Split original 3  RIF file bene export into one file per year'
+  group = 'Application'
+  description = 'Split original 3  RIF file bene export into one file per year'
   classpath sourceSets.main.runtimeClasspath
   mainClass = "org.mitre.synthea.export.rif.tools.BB2RIFBeneSplitter"
   args cmdLineArgs.split()
 }
 
 shadowJar {
-  zip64 true
+  zip64 = true
   def versionFile = new File("$projectDir/src/main/resources/version.txt")
   def versionText = "N/A"
   if (versionFile.exists()) {
@@ -252,8 +252,8 @@ task uberJar() {
 }
 
 task flexporter(type: JavaExec) {
-  group 'Application'
-  description 'Apply transformations to FHIR'
+  group = 'Application'
+  description = 'Apply transformations to FHIR'
   classpath sourceSets.main.runtimeClasspath
   mainClass = "RunFlexporter"
   // args are called "arams" because they are called with -P,
@@ -265,31 +265,31 @@ task flexporter(type: JavaExec) {
 }
 
 task concepts(type: JavaExec) {
-  group 'Application'
-  description 'Create a list of simulated concepts'
+  group = 'Application'
+  description = 'Create a list of simulated concepts'
   classpath sourceSets.main.runtimeClasspath
   mainClass = "org.mitre.synthea.helpers.Concepts"
   args 'false'
 }
 
 task conceptswithoutcosts(type: JavaExec) {
-  group 'Application'
-  description 'Create a list of simulated concepts without costs'
+  group = 'Application'
+  description = 'Create a list of simulated concepts without costs'
   classpath sourceSets.main.runtimeClasspath
   mainClass = "org.mitre.synthea.helpers.Concepts"
   args 'true'
 }
 
 task attributes(type: JavaExec) {
-  group 'Application'
-  description 'Create a list of patient attributes'
+  group = 'Application'
+  description = 'Create a list of patient attributes'
   classpath sourceSets.main.runtimeClasspath
   mainClass = "org.mitre.synthea.helpers.Attributes"
 }
 
 task overrides(type: JavaExec) {
-  group 'Application'
-  description 'Create a list of modules parameters in module override format'
+  group = 'Application'
+  description = 'Create a list of modules parameters in module override format'
   classpath sourceSets.main.runtimeClasspath
   mainClass = "org.mitre.synthea.helpers.ModuleOverrides"
   doFirst {
@@ -304,15 +304,15 @@ task overrides(type: JavaExec) {
 }
 
 task physiology(type: JavaExec) {
-    group 'Application'
-    description 'Test a physiology simulation'
+    group = 'Application'
+    description = 'Test a physiology simulation'
     classpath sourceSets.main.runtimeClasspath
     mainClass = "org.mitre.synthea.engine.PhysiologySimulator"
 }
 
 task versionTxt() {
-  group 'Build'
-  description 'Generates a version file.'
+  group = 'Build'
+  description = 'Generates a version file.'
   doLast {
     try {
       // the ruby version uses `git rev-parse HEAD` which just produces the long commit hash.
@@ -344,7 +344,9 @@ task cleanOutput {
 }
 
 // Define the main class for the application
-mainClassName = 'App'
+application {
+  mainClass = 'App'
+}
 
 run {
   // args are called "arams" because they are called with -P,
@@ -381,8 +383,8 @@ def mavenVersion = '3.3.1-SNAPSHOT'
 publishing {
     publications {
         synthea(MavenPublication) {
-            groupId mavenGroup
-            version mavenVersion
+            groupId = mavenGroup
+            version = mavenVersion
             from components.java
 
             artifact(sourceJar) {
@@ -421,18 +423,18 @@ publishing {
         maven {
             def snapshotUrl = 'https://oss.sonatype.org/content/repositories/snapshots'
             def releaseUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
-            url mavenVersion.endsWith('SNAPSHOT') ? snapshotUrl : releaseUrl
+            url = mavenVersion.endsWith('SNAPSHOT') ? snapshotUrl : releaseUrl
             credentials {
                 def user = project.hasProperty('ossToken') ? ossToken : ''
                 def pw = project.hasProperty('ossTokenPassword') ? ossTokenPassword : ''
-                username user
-                password pw
+                username = user
+                password = pw
             }
         }
     }
 }
 
 signing {
-  required { project.hasProperty('signing.keyId') }
+  required = { project.hasProperty('signing.keyId') }
   sign publishing.publications.synthea
 }

gradle/wrapper/gradle-wrapper.jar

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