Merge branch 'release/0.3.0'

sw-samuraj · Apr 7, 2018 · a1d168e · a1d168e
2 parents 462b805 + 7398707
commit a1d168e
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,8 @@
 language: groovy
-script: ./gradlew clean build --daemon
+script:
+  - ./gradlew clean build --daemon
+  - cd example
+  - ../gradlew clean build --daemon
 matrix:
   include:
   - os: linux
@@ -8,6 +11,14 @@ matrix:
     jdk: oraclejdk9
   - os: osx
     osx_image: xcode9.3beta
+    env:
+      - GOPATH=$HOME/go
+      - PATH=$PATH:$GOPATH/bin
+    before_install:
+      - mkdir -p $HOME/go/bin
+      - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+before_install:
+  - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -rf $HOME/.gradle/caches/*/plugin-resolution/

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

diff --git a/example/build.gradle b/example/build.gradle
@@ -1,6 +1,20 @@
 plugins {
-    id 'cz.swsamuraj.godep' version '0.2.1'
+    id 'cz.swsamuraj.godep' version '0.3.0'
 }
+/*
+buildscript {
+    repositories {
+        flatDir {
+            dirs '../build/libs'
+        }
+    }
+    dependencies {
+        classpath 'gradle.plugin.cz.swsamuraj:gradle-godep-plugin:0.3.0-SNAPSHOT'
+    }
+}
+
+apply plugin: 'cz.swsamuraj.godep'
+*/
 
 godep {
     importPath = 'github.com/sw-samuraj/hello'

diff --git a/src/main/groovy/cz/swsamuraj/gradle/godep/GoDepExtension.groovy b/src/main/groovy/cz/swsamuraj/gradle/godep/GoDepExtension.groovy
@@ -8,9 +8,13 @@ import org.gradle.api.provider.Property
 class GoDepExtension {
 
     final Property<String> importPath
+    final Property<Boolean> depOptional
 
     GoDepExtension(Project project) {
         importPath = project.objects.property(String)
         importPath.set('github.com/user/package')
+
+        depOptional = project.objects.property(Boolean)
+        depOptional.set(false)
     }
 }
diff --git a/src/main/groovy/cz/swsamuraj/gradle/godep/GoDepPlugin.groovy b/src/main/groovy/cz/swsamuraj/gradle/godep/GoDepPlugin.groovy
@@ -32,6 +32,8 @@ package cz.swsamuraj.gradle.godep
 import groovy.transform.CompileStatic
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.ProjectEvaluationListener
+import org.gradle.api.ProjectState
 
 @CompileStatic
 class GoDepPlugin implements Plugin<Project> {
@@ -53,5 +55,18 @@ class GoDepPlugin implements Plugin<Project> {
         project.tasks.create('build', GoBuildTask) {
             it.importPath = extension.importPath
         }
+
+        project.gradle.addProjectEvaluationListener(new ProjectEvaluationListener() {
+            @Override
+            void beforeEvaluate(Project proj) {
+            }
+
+            @Override
+            void afterEvaluate(Project proj, ProjectState projectState) {
+                if (extension.depOptional.get()) {
+                    proj.tasks.getByName('dep').enabled = false
+                }
+            }
+        })
     }
 }