Skip to content

Commit b85bbbc

Browse files
committed
Merge branch 'hotfix/0.3.2'
2 parents c54e57d + e0afca3 commit b85bbbc

File tree

4 files changed

+33
-25
lines changed

4 files changed

+33
-25
lines changed

.travis.yml

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,52 @@
11
language: groovy
2-
script:
3-
- ./gradlew clean build --daemon
4-
- cd example
5-
- ../gradlew clean build --daemon
62
jobs:
73
include:
8-
- stage: Build
9-
os: linux
10-
jdk: oraclejdk8
11-
- stage: Build
4+
- stage: Build plugin
125
os: linux
136
jdk: oraclejdk9
14-
- stage: Build
15-
os: osx
16-
osx_image: xcode9.3beta
17-
env:
18-
- GOPATH=$HOME/go
19-
- PATH=$PATH:$GOPATH/bin
20-
before_install:
21-
- mkdir -p $HOME/go/bin
22-
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
7+
script:
8+
- ./gradlew clean build
239
- stage: Deploy
2410
os: linux
2511
jdk: oraclejdk9
26-
script:
27-
- echo "Deploying to Gradle Plugin Portal..."
12+
script: skip
2813
deploy:
2914
provider: script
3015
script:
3116
- ./gradlew clean publishPlugins -Dgradle.publish.key=$GRADLE_PUBLISH_KEY -Dgradle.publish.secret=$GRADLE_PUBLISH_SECRET
3217
on:
3318
tags: true
3419
- stage: Deploy
35-
script:
36-
- echo "Deploying to GitHub releases..."
20+
script: skip
3721
deploy:
3822
provider: releases
3923
api_key: $GITHUB_OAUTH_TOKEN
4024
on:
4125
tags: true
26+
- stage: Build example
27+
os: linux
28+
jdk: oraclejdk8
29+
script:
30+
- cd example
31+
- ../gradlew clean build
32+
- stage: Build example
33+
os: linux
34+
jdk: oraclejdk9
35+
script:
36+
- cd example
37+
- ../gradlew clean build
38+
- stage: Build example
39+
os: osx
40+
osx_image: xcode9.3beta
41+
env:
42+
- GOPATH=$HOME/go
43+
- PATH=$PATH:$GOPATH/bin
44+
script:
45+
- cd example
46+
- ../gradlew clean build
47+
before_install:
48+
- mkdir -p $HOME/go/bin
49+
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
4250
before_install:
4351
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
4452
before_cache:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Plugin expects that _go_ and _dep_ commands are already installed on given syste
2525

2626
```groovy
2727
plugins {
28-
id "cz.swsamuraj.godep" version "0.3.1"
28+
id "cz.swsamuraj.godep" version "0.3.2"
2929
}
3030
```
3131
### All Gradle versions (or local repository) ##
@@ -38,7 +38,7 @@ buildscript {
3838
}
3939
}
4040
dependencies {
41-
classpath "gradle.plugin.cz.swsamuraj:gradle-godep-plugin:0.3.1"
41+
classpath "gradle.plugin.cz.swsamuraj:gradle-godep-plugin:0.3.2"
4242
}
4343
}
4444

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
compile localGroovy()
1313
}
1414

15-
version = '0.3.1'
15+
version = '0.3.2'
1616
group = 'cz.swsamuraj'
1717

1818
jar {

example/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'cz.swsamuraj.godep' version '0.3.1'
2+
id 'cz.swsamuraj.godep' version '0.3.2'
33
}
44
/*
55
buildscript {

0 commit comments

Comments
 (0)