Skip to content

Commit 23186cd

Browse files
authored
Merge pull request #488 from dwijnand/versions
Update version/mimaPreviousArtifacts/sbt.version
2 parents 17a4ba5 + 7975a3f commit 23186cd

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

build.sbt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import Util._
22
import Dependencies._
33
import Scripted._
44

5-
def baseVersion = "1.1.0-SNAPSHOT"
65
def internalPath = file("internal")
76

87
lazy val compilerBridgeScalaVersions = List(scala212, scala213, scala211, scala210)
@@ -11,7 +10,7 @@ lazy val compilerBridgeTestScalaVersions = List(scala212, scala211, scala210)
1110
def mimaSettings: Seq[Setting[_]] = Seq(
1211
mimaPreviousArtifacts := Set(
1312
"1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4", "1.0.5",
14-
"1.1.0",
13+
"1.1.0", "1.1.1",
1514
) map (version =>
1615
organization.value %% moduleName.value % version
1716
cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled)
@@ -123,7 +122,7 @@ lazy val zincRoot: Project = (project in file("."))
123122
.settings(
124123
inThisBuild(
125124
Seq(
126-
git.baseVersion := baseVersion,
125+
git.baseVersion := "1.1.1",
127126
// https://github.com/sbt/sbt-git/issues/109
128127
// Workaround from https://github.com/sbt/sbt-git/issues/92#issuecomment-161853239
129128
git.gitUncommittedChanges := {

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.0.3
1+
sbt.version=1.1.1

0 commit comments

Comments
 (0)