Update to Gradle 4

jzheaux · jzheaux · commit 133cd3e846ac · 2021-12-14T10:26:38.000-07:00
Issue spring-projectsgh-520
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ build
 *.ipr
 .idea
 *.iws
+out
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -5,5 +5,3 @@ dependencies {
     compile gradleApi()
     compile localGroovy()
 }
-
-configurations.archives.artifacts.clear()
diff --git a/gradle/release-checks.gradle b/gradle/release-checks.gradle
@@ -1,8 +1,10 @@
-task checkDependencies << {
-    verifyNoDependenciesMatchingVersion(".*-SNAPSHOT")
-    if(releaseBuild) {
-        verifyNoDependenciesMatchingVersion(".*M.*")
-        verifyNoDependenciesMatchingVersion(".*RC.*")
+task checkDependencies {
+    doLast {
+        verifyNoDependenciesMatchingVersion(".*-SNAPSHOT")
+        if (releaseBuild) {
+            verifyNoDependenciesMatchingVersion(".*M.*")
+            verifyNoDependenciesMatchingVersion(".*RC.*")
+        }
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/TestsWithJdepend.java b/odm/src/test/java/org/springframework/ldap/odm/test/TestsWithJdepend.java
@@ -30,7 +30,7 @@ public class TestsWithJdepend {
     @Before
     public void setUp() throws IOException {
         jdepend = new JDepend();
-        jdepend.addDirectory("build/classes/main");
+        jdepend.addDirectory("build/classes/java/main");
     }
     
     @Test
diff --git a/settings.gradle b/settings.gradle
@@ -30,8 +30,4 @@ rootProject.children.each { p->
 }
 
 findProject(":spring-ldap-test-support").name = "spring-ldap-test"
-findProject(":spring-ldap-test-support-unboundid").name = "spring-ldap-test-unboundid"
-
-// Exposes gradle buildSrc for IDE support
-include "buildSrc"
-rootProject.children.find{ it.name == "buildSrc" }.name = "spring-build-src"
+findProject(":spring-ldap-test-support-unboundid").name = "spring-ldap-test-unboundid"

-Original file line number
+Diff line change
 *.ipr
 .idea
 *.iws
 +out
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,3 @@ dependencies {`
`5`	`5`	`compile gradleApi()`
`6`	`6`	`compile localGroovy()`
`7`	`7`	`}`
`8`		`-`
`9`		`-configurations.archives.artifacts.clear()`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class TestsWithJdepend {`
`30`	`30`	`@Before`
`31`	`31`	`public void setUp() throws IOException {`
`32`	`32`	`jdepend = new JDepend();`
`33`		`- jdepend.addDirectory("build/classes/main");`
	`33`	`+ jdepend.addDirectory("build/classes/java/main");`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,4 @@ rootProject.children.each { p->`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`findProject(":spring-ldap-test-support").name = "spring-ldap-test"`
`33`		`-findProject(":spring-ldap-test-support-unboundid").name = "spring-ldap-test-unboundid"`
`34`		`-`
`35`		`-// Exposes gradle buildSrc for IDE support`
`36`		`-include "buildSrc"`
`37`		`-rootProject.children.find{ it.name == "buildSrc" }.name = "spring-build-src"`
	`33`	`+findProject(":spring-ldap-test-support-unboundid").name = "spring-ldap-test-unboundid"`