Update to Gradle 4

Issue gh-520
spring-projects · Dec 14, 2021 · 133cd3e · 133cd3e
1 parent 50d9af5
commit 133cd3e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
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
@@ Expand Up / @@ -10,3 +10,4 @@ build @@
     *.ipr
     .idea
     *.iws
+    out