Fixed root project directory lookup (issue with Gradle 4.6+)

Author: alexvasilkov

src/main/groovy/com/alexvasilkov/vcs/VcsProperties.groovy

@@ -1,8 +1,12 @@
 package com.alexvasilkov.vcs
 
+import org.gradle.api.initialization.Settings
+
 @Singleton
 class VcsProperties {
 
+    private static final String DEFAULT_DIR = 'libraries'
+
     def dir
     boolean cleanup = true
 
@@ -11,4 +15,11 @@ class VcsProperties {
         closure()
     }
 
+    void resolve(Settings settings) {
+        if (!dir) dir = new File(settings.rootDir, DEFAULT_DIR)
+    }
+
+    File getDir() {
+        return dir as File
+    }
 }

src/main/groovy/com/alexvasilkov/vcs/VcsSettingsPlugin.groovy

@@ -24,8 +24,9 @@ class VcsSettingsPlugin implements Plugin<Settings> {
         CredentialsHelper.init(settings.gradle)
 
         settings.gradle.settingsEvaluated { Settings sett ->
+            VcsProperties.instance.resolve(sett)
             resolveDependenciesRecursively(sett, sett.projectDescriptorRegistry.allProjects)
-            cleanup(sett)
+            cleanup()
         }
 
         // Adding created vcs projects dependencies for each project
@@ -51,12 +52,12 @@ class VcsSettingsPlugin implements Plugin<Settings> {
                 if (script.metaClass.respondsTo(script, 'vcs')) {
                     // Adding git method
                     script.binding.setVariable('git', { Map params ->
-                        dependencies.add(project.name, new GitDependency(project, params))
+                        dependencies.add(project.name, new GitDependency(params))
                     })
 
                     // Adding svn method
                     script.binding.setVariable('svn', { Map params ->
-                        dependencies.add(project.name, new SvnDependency(project, params))
+                        dependencies.add(project.name, new SvnDependency(params))
                     })
 
                     // Executing configuration method
@@ -86,10 +87,10 @@ class VcsSettingsPlugin implements Plugin<Settings> {
         if (newProjects) resolveDependenciesRecursively(settings, newProjects)
     }
 
-    private void cleanup(Settings settings) {
+    private void cleanup() {
         if (VcsProperties.instance.cleanup) {
             // Cleaning up unused directories and files
-            File libsDir = VcsDependency.getDefaultDir(settings.defaultProject)
+            File libsDir = VcsProperties.instance.dir
             libsDir.listFiles().each { File dir ->
                 boolean found = false
                 dependencies.all().each { VcsDependency d ->

src/main/groovy/com/alexvasilkov/vcs/dependency/GitDependency.groovy

@@ -1,15 +1,14 @@
 package com.alexvasilkov.vcs.dependency
 
 import org.gradle.api.GradleException
-import org.gradle.api.initialization.ProjectDescriptor
 
 class GitDependency extends VcsDependency {
 
     final String remote
     final String commit
 
-    GitDependency(ProjectDescriptor project, Map map) {
-        super(project, map)
+    GitDependency(Map map) {
+        super(map)
         remote = map.remote
         commit = map.commit
     }
@@ -29,10 +28,9 @@ class GitDependency extends VcsDependency {
     void checkEquals(VcsDependency d) {
         super.checkEquals(d)
 
-        GitDependency g = (GitDependency) d;
+        GitDependency g = (GitDependency) d
 
         if (g.remote != remote) throwEqualCheckFail('remote', remote, g.remote)
         if (g.commit != commit) throwEqualCheckFail('commit', commit, g.commit)
     }
-
 }

src/main/groovy/com/alexvasilkov/vcs/dependency/SvnDependency.groovy

@@ -1,15 +1,14 @@
 package com.alexvasilkov.vcs.dependency
 
 import org.gradle.api.GradleException
-import org.gradle.api.initialization.ProjectDescriptor
 
 class SvnDependency extends VcsDependency {
 
     final long rev
     final boolean isHead
 
-    SvnDependency(ProjectDescriptor project, Map map) {
-        super(project, map)
+    SvnDependency(Map map) {
+        super(map)
         isHead = 'HEAD'.equals(map.rev)
         rev = map.rev instanceof Long || map.rev instanceof Integer ? map.rev : 0L
     }
@@ -24,10 +23,9 @@ class SvnDependency extends VcsDependency {
     void checkEquals(VcsDependency d) {
         super.checkEquals(d)
 
-        SvnDependency s = (SvnDependency) d;
+        SvnDependency s = (SvnDependency) d
 
         if (s.isHead != isHead) throwEqualCheckFail('isHead', isHead, s.isHead)
         if (s.rev != rev) throwEqualCheckFail('rev', rev, s.rev)
     }
-
 }

src/main/groovy/com/alexvasilkov/vcs/dependency/VcsDependency.groovy

@@ -3,11 +3,9 @@ package com.alexvasilkov.vcs.dependency
 import com.alexvasilkov.vcs.VcsProperties
 import com.alexvasilkov.vcs.util.CredentialsHelper
 import org.gradle.api.GradleException
-import org.gradle.api.initialization.ProjectDescriptor
 
 abstract class VcsDependency {
 
-    private static final String DEFAULT_DIR = 'libraries'
     private static final String DEFAULT_AUTH_GROUP = 'VCS'
     private static final String DEFAULT_CONFIG_NAME = 'implementation'
 
@@ -27,13 +25,13 @@ abstract class VcsDependency {
 
     final File repoDir
 
-    VcsDependency(ProjectDescriptor project, Map map) {
+    VcsDependency(Map map) {
         name = map.name
         url = map.url
         path = map.path
 
         File mapDir = map.dir instanceof String || map.dir instanceof File ? map.dir as File : null
-        dir = (mapDir ? mapDir : getDefaultDir(project)).canonicalFile
+        dir = (mapDir ? mapDir : VcsProperties.instance.dir).canonicalFile
 
         noAuth = map.noAuth instanceof Boolean ? map.noAuth : false
         authGroup = map.authGroup ? map.authGroup : DEFAULT_AUTH_GROUP
@@ -93,12 +91,4 @@ abstract class VcsDependency {
         throw new GradleException("Found 2 incompatible dependencies '${name}' with different" +
                 " '${paramName}' values: '${val1}' and '${val2}'")
     }
-
-    static File getDefaultDir(ProjectDescriptor project) {
-        if (VcsProperties.instance.dir) return VcsProperties.instance.dir as File
-
-        ProjectDescriptor root = project
-        while (root.parent != null) root = root.parent
-        return new File(root.projectDir, DEFAULT_DIR)
-    }
 }