Merge branch 'hotfix/0.4.1'

sw-samuraj · Jun 5, 2018 · 8263d75 · 8263d75
2 parents da1070f + adcd3c3
commit 8263d75
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,11 +6,16 @@
 * The `vet` task added to the life-cycle ([#])
 * Code refactoring ([#])
 
-## 0.4.1 (next version)
+## 0.4.2 (next version)
 
 * Document _How to handle proprietary vendors_.
   ([#])
 
+## 0.4.1
+
+* Fix error `proprietaryVendors` property without provider.
+  ([#10](https://github.com/sw-samuraj/gradle-godep-plugin/pull/10))
+
 ## 0.4.0
 
 * The `proprietaryVendors` task for dealing with import packages in private repositories.

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Plugin expects that _go_ and _dep_ commands are already installed on given syste
 
 ```groovy
 plugins {
-    id "cz.swsamuraj.godep" version "0.4.0"
+    id "cz.swsamuraj.godep" version "0.4.1"
 }
 ```
 ### All Gradle versions (or local repository)
@@ -38,7 +38,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.cz.swsamuraj:gradle-godep-plugin:0.4.0"
+        classpath "gradle.plugin.cz.swsamuraj:gradle-godep-plugin:0.4.1"
     }
 }
 

diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     compile localGroovy()
 }
 
-version = '0.4.0'
+version = '0.4.1'
 group = 'cz.swsamuraj'
 
 jar {

diff --git a/example/build.gradle b/example/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'cz.swsamuraj.godep' version '0.4.0'
+    id 'cz.swsamuraj.godep' version '0.4.1'
 }
 /*
 buildscript {
@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'gradle.plugin.cz.swsamuraj:gradle-godep-plugin:0.5.0-SNAPSHOT'
+        classpath 'gradle.plugin.cz.swsamuraj:gradle-godep-plugin:0.5.0-SNAPSTHOT'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/groovy/cz/swsamuraj/gradle/godep/GoDepPlugin.groovy b/src/main/groovy/cz/swsamuraj/gradle/godep/GoDepPlugin.groovy
@@ -53,6 +53,7 @@ class GoDepPlugin implements Plugin<Project> {
 
         project.tasks.create('proprietaryVendors', ProprietaryVendorsTask) {
             it.importPath = extension.importPath
+            it.proprietaryVendors = extension.proprietaryVendors
         }
 
         project.tasks.create('test', GoTestTask) {

diff --git a/src/main/groovy/cz/swsamuraj/gradle/godep/ProprietaryVendorsTask.groovy b/src/main/groovy/cz/swsamuraj/gradle/godep/ProprietaryVendorsTask.groovy
@@ -40,7 +40,7 @@ import org.gradle.process.ExecSpec
 class ProprietaryVendorsTask extends DefaultTask {
 
     final Property<String> importPath = project.objects.property(String)
-    final Property<Map> packagesToImport = project.objects.property(Map)
+    final Property<Map> proprietaryVendors = project.objects.property(Map)
 
     ProprietaryVendorsTask() {
         group = 'go & dep'
@@ -50,7 +50,7 @@ class ProprietaryVendorsTask extends DefaultTask {
 
     @TaskAction
     void proprietaryVendors() {
-        packagesToImport.get().forEach { String pkg, String ver ->
+        proprietaryVendors.get().forEach { String pkg, String ver ->
             int lastSeparator = pkg.lastIndexOf(File.separator)
             String parentPkg = pkg.substring(0, lastSeparator)
             File parentDir = new File(project.projectDir, "vendor/${parentPkg}")