Skip to content

Commit

Permalink
Update Readme.md, Disable publish until 2.0 is on master
Browse files Browse the repository at this point in the history
  • Loading branch information
leonard84 committed Mar 4, 2019
1 parent e85e79c commit ed38b97
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ http://webconsole.spockframework.org.

Latest Versions
---------------
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
current development version is **1.3-SNAPSHOT** (1.3-groovy-2.4-SNAPSHOT and 1.3-groovy-2.5-SNAPSHOT).
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

This comment has been minimized.

Copy link
@henrik242

henrik242 Mar 26, 2019

Contributor

@leonard84 You forgot to remove -RC1 in the paranthesis

This comment has been minimized.

Copy link
@leonard84

leonard84 Mar 26, 2019

Author Member

Jup I did ;)

current development version is **2.0-SNAPSHOT** (2.0-groovy-2.5-SNAPSHOT).

**NOTE:** Spock 1.2 drops support for Java 6, Groovy 2.0 and Groovy 2.3.
**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
and require Java 8/groovy-2.5

Releases are available from [Maven Central](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.spockframework%22).
Development snapshots are available from [Sonatype OSS](https://oss.sonatype.org/content/repositories/snapshots/org/spockframework/).
Expand All @@ -40,8 +41,8 @@ repositories {
}
dependencies {
compile 'org.spockframework.spock:spock-core:spock-1.2'
compile 'org.spockframework.spock:spock-spring:spock-1.2'
compile 'org.spockframework.spock:spock-core:spock-1.3'
compile 'org.spockframework.spock:spock-spring:spock-1.3'
}
```
3. For intermediate releases you can also use the commit-hash as version, e.g. compile `com.github.spockframework.spock:spock-core:d91bf785a1`
Expand Down
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ plugins {
description = "Spock Framework"

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

0 comments on commit ed38b97

Please sign in to comment.