Skip to content

Commit 17e8699

Browse files
committed
update dependencies; update travis config to use container infrastructure and cache gradle dependencies
1 parent 0a8c6eb commit 17e8699

File tree

8 files changed

+25
-9
lines changed

8 files changed

+25
-9
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
### 1.1.3 (2015-08-13)
2+
* Update gradle 2.5 -> 2.6
3+
* Update checkstyle 6.8.1 -> 6.9
4+
* Update gradle-bintray-plugin 1.2 -> 1.3.1
5+
* Update gradle-release plugin 2.1.2 -> 2.2.0
6+
* Update .travis.yml to use [container infrastructure](http://docs.travis-ci.com/user/migrating-from-legacy) and enable cache for gradle dependencies
7+
18
### 1.1.2 (2015-07-29)
29
* Fix java 7 build compatibility
310

app/templates/gradle-base/gradle/buildscript.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ repositories {
66
}
77
dependencies {
88
// bintray upload
9-
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2"
9+
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.3.1"
1010
// coveralls integration
1111
classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0"
1212
// check dependencies updates
1313
classpath "com.github.ben-manes:gradle-versions-plugin:0.11.3"
14-
classpath 'net.researchgate:gradle-release:2.1.2'
14+
classpath 'net.researchgate:gradle-release:2.2.0'
1515
classpath "be.insaneprogramming.gradle:animalsniffer-gradle-plugin:1.4.0"
1616
}

app/templates/gradle-base/gradle/quality.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ apply plugin: 'checkstyle'
121121

122122
// Note: checkstyle 6.2 requires jdk7 or above. For jdk6 use older version (6.1.1)
123123
checkstyle {
124-
toolVersion = "6.8.1"
124+
toolVersion = "6.9"
125125
ignoreFailures = ignoreFailuresCfg
126126
sourceSets = [sourceSets.main]
127127
configFile = file('gradle/config/checkstyle/checkstyle.xml')
@@ -131,7 +131,7 @@ checkstyle {
131131
// https://issues.gradle.org/browse/GRADLE-3314
132132
dependencies {
133133
checkstyle files('gradle/config/checkstyle/compatibility.jar')
134-
checkstyle "com.puppycrawl.tools:checkstyle:6.8.1"
134+
checkstyle "com.puppycrawl.tools:checkstyle:6.9"
135135
}
136136
}
137137

@@ -167,6 +167,9 @@ gradle.taskGraph.afterTask { Task task, TaskState state ->
167167
// important for travis build to quickly see failure cause
168168
// see http://www.gradle.org/docs/current/dsl/org.gradle.api.tasks.testing.Test.html#org.gradle.api.tasks.testing.Test:testLogging
169169
test {
170+
// restart test vm after 100 tests to reduce memory usage (to solve travis error 137)
171+
forkEvery 100
172+
170173
testLogging {
171174
events "skipped", "failed", "standardError"
172175
exceptionFormat "full"
5 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jul 29 00:28:35 NOVT 2015
1+
#Wed Aug 12 00:31:43 NOVT 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip

app/templates/project-base/_travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
language: java
22
jdk:
33
- <%= travisJdk %>
4+
5+
sudo: false
46
env:
57
- TERM=dumb
68

@@ -14,4 +16,8 @@ script:
1416
- ./gradlew check
1517

1618
after_success:
17-
- ./gradlew jacocoTestReport coveralls
19+
- ./gradlew jacocoTestReport coveralls
20+
21+
cache:
22+
directories:
23+
- $HOME/.gradle/caches/

app/templates/project-base/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = '<%= libDesc %>'
88
// convention: project.name == github project name == bintray package page
99
project.ext {
1010
build = {
11-
gradle = 2.5
11+
gradle = 2.6
1212
java = <%= targetJava %>
1313
// if not empty runs animal sniffer on compile to guarantee binary compatibility; set '' to disable
1414
signature = '<%= animalsnifferSignature %>'

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "generator-lib-java",
3-
"version": "1.1.2",
3+
"version": "1.1.3",
44
"description": "Java library project generator, hosted on github, build with gradle and published to bintray and maven central",
55
"license": "MIT",
66
"main": "app/index.js",

0 commit comments

Comments
 (0)