v2.0.1: Added defaultAuthGroup option

Author: alexvasilkov

README.md

@@ -14,7 +14,7 @@ In `settings.gradle` file add the following lines:
             jcenter()
         }
         dependencies {
-            classpath 'com.alexvasilkov:gradle-git-dependencies:2.0.0'
+            classpath 'com.alexvasilkov:gradle-git-dependencies:2.0.1'
         }
     }
 
@@ -25,6 +25,7 @@ Optionally you can provide settings next in `settings.gradle`:
     git {
         dir 'libs' // Directory in which to store git repositories, 'libs' by default
         cleanup true // Whether to cleanup unused dirs inside 'libs' dir, true by default
+        defaultAuthGroup 'group name' // Default auth group to be used for all repos. See `Credentials` section below.
     }
 
 ### Usage ###
@@ -120,6 +121,8 @@ If `authGroup` is provided then the plugin will search for `git.[authGroup].user
 * ~/.gradle/gradle.properties
 * environment variables, in uppercase and with `_` instead of `.`, e.g. `GIT_GITHUB_USERNAME`
 
+If `defaultAuthGroup` is provided in `settings.gradle` then it will be used for all repos
+unless `authGroup` is explicitly set.
 
 ### Migration from v1.x.x ###
 

build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'groovy'
 
 ext.group = 'com.alexvasilkov'
 ext.artifactId = 'gradle-git-dependencies'
-ext.version = '2.0.0'
+ext.version = '2.0.1'
 ext.name = 'Git Dependencies plugin'
 ext.description = 'Gradle plugin to add external git repos as project dependencies'
 ext.github = 'https://github.com/alexvasilkov/GradleGitDependenciesPlugin'

src/main/groovy/com/alexvasilkov/gradle/git/Credentials.groovy

@@ -12,8 +12,8 @@ class Credentials {
     private Properties gradleUserProps
     private Properties localProps
 
-    Credentials(Gradle gradle) {
-        userDir = gradle.gradleUserHomeDir
+    Credentials(File gradleUserHomeDir) {
+        userDir = gradleUserHomeDir
 
         File gradleFile = new File('gradle.properties')
         if (gradleFile.exists()) {

src/main/groovy/com/alexvasilkov/gradle/git/GitDependency.groovy

@@ -28,8 +28,8 @@ class GitDependency {
         commit = builder.commit ?: 'master'
         projectPath = builder.projectPath
         dir = builder.dir ?: (name != null ? new File(props.dir, name) : null)
-        authGroup = builder.authGroup
-        needsAuth = builder.authGroup || builder.username || builder.password
+        authGroup = builder.authGroup ?: props.defaultAuthGroup
+        needsAuth = authGroup || builder.username || builder.password
         username = needsAuth ? (builder.username ?: credentials.username(authGroup)) : null
         password = needsAuth ? (builder.password ?: credentials.password(authGroup)) : null
         keepUpdated = builder.keepUpdated ?: true

src/main/groovy/com/alexvasilkov/gradle/git/SettingsExtension.groovy

@@ -8,6 +8,7 @@ class SettingsExtension {
     final File rootDir
 
     File dir
+    String defaultAuthGroup
     boolean cleanup
     boolean cleanupIdeaModules
 
@@ -16,6 +17,7 @@ class SettingsExtension {
         this.rootDir = settings.rootDir
         // Setting default values:
         this.dir = new File(settings.rootDir, 'libs')
+        this.defaultAuthGroup = null
         this.cleanup = true
         this.cleanupIdeaModules = true
     }
@@ -32,6 +34,10 @@ class SettingsExtension {
             SettingsExtension.this.dir = dir as File
         }
 
+        void defaultAuthGroup(String authGroup) {
+            SettingsExtension.this.defaultAuthGroup = authGroup
+        }
+
         void cleanup(boolean cleanup) {
             SettingsExtension.this.cleanup = cleanup
         }

src/main/groovy/com/alexvasilkov/gradle/git/SettingsPlugin.groovy

@@ -27,7 +27,7 @@ class SettingsPlugin implements Plugin<Settings> {
             GitDependency dep = buildDependency(settings, null, url, closure)
             dependencies.add(null, dep)
         })
-        this.credentials = new Credentials(settings.gradle)
+        this.credentials = new Credentials(settings.gradle.gradleUserHomeDir)
 
         // Adding configuration method to collect plugin settings
         settings.metaClass."$EXTENSION_NAME" = props.&apply