Skip to content

Commit ed38b97

Browse files
committed
Update Readme.md, Disable publish until 2.0 is on master
1 parent e85e79c commit ed38b97

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

Diff for: README.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ http://webconsole.spockframework.org.
1818

1919
Latest Versions
2020
---------------
21-
The latest release version is **1.3-RC1** (1.3-RC1-groovy-2.4, 1.3-RC1-groovy-2.5), released on 2019-01-22. The
22-
current development version is **1.3-SNAPSHOT** (1.3-groovy-2.4-SNAPSHOT and 1.3-groovy-2.5-SNAPSHOT).
21+
The latest release version is **1.3** (1.3-RC1-groovy-2.4, 1.3-RC1-groovy-2.5), released on 2019-01-22. The
22+
current development version is **2.0-SNAPSHOT** (2.0-groovy-2.5-SNAPSHOT).
2323

24-
**NOTE:** Spock 1.2 drops support for Java 6, Groovy 2.0 and Groovy 2.3.
24+
**NOTE:** Spock 1.3 is the last planned release for 1.x based on JUnit 4. Spock 2.0 will be based on the JUnit 5 Platform
25+
and require Java 8/groovy-2.5
2526

2627
Releases are available from [Maven Central](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.spockframework%22).
2728
Development snapshots are available from [Sonatype OSS](https://oss.sonatype.org/content/repositories/snapshots/org/spockframework/).
@@ -40,8 +41,8 @@ repositories {
4041
}
4142
4243
dependencies {
43-
compile 'org.spockframework.spock:spock-core:spock-1.2'
44-
compile 'org.spockframework.spock:spock-spring:spock-1.2'
44+
compile 'org.spockframework.spock:spock-core:spock-1.3'
45+
compile 'org.spockframework.spock:spock-spring:spock-1.3'
4546
}
4647
```
4748
3. For intermediate releases you can also use the commit-hash as version, e.g. compile `com.github.spockframework.spock:spock-core:d91bf785a1`

Diff for: build.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ plugins {
1111
description = "Spock Framework"
1212

1313
ext {
14-
baseVersion = "1.3"
15-
snapshotVersion = false
14+
baseVersion = "1.3.1"
15+
snapshotVersion = true
1616
releaseCandidate = 0
1717
variants = [2.4, 2.5]
1818
variant = System.getProperty("variant") as BigDecimal ?: variants.first()
@@ -234,7 +234,9 @@ if (gradle.startParameter.taskNames == ["travisCiBuild"]) {
234234
maxParallelForks = 2
235235
}
236236
}
237-
if (System.getenv("TRAVIS_PULL_REQUEST") == "false" && System.getenv("TRAVIS_BRANCH") == "master") {
237+
if (System.getenv("TRAVIS_PULL_REQUEST") == "false" && System.getenv("TRAVIS_BRANCH") == "master" && baseVersion.startsWith('2.')) { /* TODO remove baseVersion check when switching to 2.x
238+
1.3 is EOL so don't publish new snapshot/docs when updating Readme.md until 2.x is merged to master
239+
*/
238240
if (javaVersion == javaVersions.min()) {
239241
gradle.startParameter.taskNames += ["publish"]
240242
if (!snapshotVersion) {

0 commit comments

Comments
 (0)