Merge branch 'hotfix/0.3.2'

sw-samuraj · Apr 7, 2018 · b85bbbc · b85bbbc
2 parents c54e57d + e0afca3
commit b85bbbc
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,44 +1,52 @@
 language: groovy
-script:
-  - ./gradlew clean build --daemon
-  - cd example
-  - ../gradlew clean build --daemon
 jobs:
   include:
-  - stage: Build
-    os: linux
-    jdk: oraclejdk8
-  - stage: Build
+  - stage: Build plugin
     os: linux
     jdk: oraclejdk9
-  - stage: Build
-    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
+    script:
+      - ./gradlew clean build
   - stage: Deploy
     os: linux
     jdk: oraclejdk9
-    script:
-      - echo "Deploying to Gradle Plugin Portal..."
+    script: skip
     deploy:
       provider: script
       script:
         - ./gradlew clean publishPlugins -Dgradle.publish.key=$GRADLE_PUBLISH_KEY -Dgradle.publish.secret=$GRADLE_PUBLISH_SECRET
       on:
         tags: true
   - stage: Deploy
-    script:
-      - echo "Deploying to GitHub releases..."
+    script: skip
     deploy:
       provider: releases
       api_key: $GITHUB_OAUTH_TOKEN
       on:
         tags: true
+  - stage: Build example
+    os: linux
+    jdk: oraclejdk8
+    script:
+      - cd example
+      - ../gradlew clean build
+  - stage: Build example
+    os: linux
+    jdk: oraclejdk9
+    script:
+      - cd example
+      - ../gradlew clean build
+  - stage: Build example
+    os: osx
+    osx_image: xcode9.3beta
+    env:
+      - GOPATH=$HOME/go
+      - PATH=$PATH:$GOPATH/bin
+    script:
+      - cd example
+      - ../gradlew clean build
+    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:

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.3.1"
+    id "cz.swsamuraj.godep" version "0.3.2"
 }
 ```
 ### All Gradle versions (or local repository) ##
@@ -38,7 +38,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.cz.swsamuraj:gradle-godep-plugin:0.3.1"
+        classpath "gradle.plugin.cz.swsamuraj:gradle-godep-plugin:0.3.2"
     }
 }
 

diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     compile localGroovy()
 }
 
-version = '0.3.1'
+version = '0.3.2'
 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.3.1'
+    id 'cz.swsamuraj.godep' version '0.3.2'
 }
 /*
 buildscript {