luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #150 from dwijnand/merge-1.1.x-into-1.x 

Merge 1.1.x into 1.x
This commit is contained in:
Dale Wijnand 2018-02-14 14:23:59 +00:00 committed by GitHub
parent b0baf7de6d 130ec14c99
commit 9891f07bda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.sbt
View File

@ -2,7 +2,6 @@ import Dependencies._
import Util._ import Util._
//import com.typesafe.tools.mima.core._, ProblemFilters._ //import com.typesafe.tools.mima.core._, ProblemFilters._
def baseVersion = "1.0.2-SNAPSHOT"
def internalPath = file("internal") def internalPath = file("internal")
def commonSettings: Seq[Setting[_]] = Seq( def commonSettings: Seq[Setting[_]] = Seq(
@ -33,7 +32,7 @@ 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.0", "1.1.1", "1.1.2",
) 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)
@ -55,7 +54,7 @@ lazy val utilRoot: Project = (project in file("."))
.settings( .settings(
inThisBuild( inThisBuild(
Seq( Seq(
git.baseVersion := baseVersion, git.baseVersion := "1.2.0",
version := { version := {
val v = version.value val v = version.value
if (v contains "SNAPSHOT") git.baseVersion.value if (v contains "SNAPSHOT") git.baseVersion.value

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=1.1.0 sbt.version=1.1.1