Merge pull request #171 from eed3si9n/wip/next

1.2.1-SNAPSHOT
This commit is contained in:
eugene yokota 2018-08-01 00:29:23 -04:00 committed by GitHub
commit 6a9c7c934e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -32,7 +32,8 @@ def commonSettings: Seq[Setting[_]] = Seq(
val mimaSettings = Def settings ( val mimaSettings = Def settings (
mimaPreviousArtifacts := Set( mimaPreviousArtifacts := Set(
"1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.0", "1.0.1", "1.0.2", "1.0.3",
"1.1.0", "1.1.1", "1.1.2", "1.1.3" "1.1.0", "1.1.1", "1.1.2", "1.1.3",
"1.2.0",
) map (version => ) map (version =>
organization.value %% moduleName.value % version organization.value %% moduleName.value % version
cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled) cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled)
@ -53,7 +54,7 @@ lazy val utilRoot: Project = (project in file("."))
.settings( .settings(
inThisBuild( inThisBuild(
Seq( Seq(
git.baseVersion := "1.2.0", git.baseVersion := "1.2.1",
version := { version := {
val v = version.value val v = version.value
if (v contains "SNAPSHOT") git.baseVersion.value + "-SNAPSHOT" if (v contains "SNAPSHOT") git.baseVersion.value + "-SNAPSHOT"

View File

@ -1 +1 @@
sbt.version=1.1.6 sbt.version=1.2.0