Update to Gradle 8.2.1 and adjust away from deprecated syntax (#59)

labkey-susanh · web-flow · commit 37957ca4397e · 2023-07-17T16:22:21.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## version 5.3.0-SNAPSHOT
 *Released*: TBD
+* Update to Gradle 8.2.1 and adjust away from deprecated syntax
 
 ## version 5.2.0
 *Released*: 3 May 2023
diff --git a/build.gradle b/build.gradle
@@ -106,7 +106,9 @@ jar {
                 }
             }
 
-    libsDirName = "jar"
+}
+base {
+    libsDirectory = layout.buildDirectory.dir('jar')
 }
 
 project.tasks.withType(JavaCompile).configureEach {
diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@ hamcrestVersion=1.3
 httpclient5Version=5.2.1
 httpcore5Version=5.2.1
 
-jsonObjectVersion=20230227
+jsonObjectVersion=20230618
 
 junitVersion=4.13.2
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,9 @@ jar {`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`		`- libsDirName = "jar"`
	`109`	`+}`
	`110`	`+base {`
	`111`	`+ libsDirectory = layout.buildDirectory.dir('jar')`
`110`	`112`	`}`
`111`	`113`
`112`	`114`	`project.tasks.withType(JavaCompile).configureEach {`