Skip to content

Commit 1f8dbed

Browse files
authored
Merge pull request #371 from olafurpg/master
Prepare for v0.5.1
2 parents 75e07af + 3573279 commit 1f8dbed

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
- CI_TEST: ci-slow
1414
CI_SCALA_VERSION: 2.11.11
1515
- CI_TEST: scalafmt
16-
- CI_TEST: mimaReportBinaryIssues
16+
- CI_TEST: mima
1717

1818
cache:
1919
directories:

build.sbt

+8-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ commands += Command.command("ci-slow") { s =>
3232
"scalafix-sbt/it:test" ::
3333
s
3434
}
35+
commands += Command.command("mima") { s =>
36+
"very mimaReportBinaryIssues" ::
37+
s
38+
}
3539

3640
lazy val adhocRepoUri = sys.props("scalafix.repository.uri")
3741
lazy val adhocRepoCredentials = sys.props("scalafix.repository.credentials")
@@ -66,14 +70,13 @@ lazy val publishSettings = Seq(
6670
)
6771
),
6872
mimaPreviousArtifacts := {
73+
val previousArtifactVersion = "0.5.0"
6974
// NOTE(olafur) shudder, can't figure out simpler way to do the same.
7075
val binaryVersion =
7176
if (crossVersion.value.isInstanceOf[CrossVersion.Full]) scalaVersion.value
7277
else scalaBinaryVersion.value
7378
Set(
74-
organization.value %
75-
s"${moduleName.value}_$binaryVersion" %
76-
sys.props.getOrElse("scalafix.stable.version", stableVersion.value)
79+
organization.value % s"${moduleName.value}_$binaryVersion" % previousArtifactVersion
7780
)
7881
},
7982
mimaBinaryIssueFilters ++= Mima.ignoredABIProblems,
@@ -88,6 +91,8 @@ lazy val publishSettings = Seq(
8891
)
8992

9093
lazy val noPublish = allSettings ++ Seq(
94+
mimaReportBinaryIssues := {},
95+
mimaPreviousArtifacts := Set.empty,
9196
publishArtifact := false,
9297
publish := {},
9398
publishLocal := {}

project/Dependencies.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
44

55
object Dependencies {
66

7-
val scalametaV = "2.0.0-RC3"
7+
val scalametaV = "2.0.1"
88
val metaconfigV = "0.5.2"
99
def semanticdbSbt = "0.4.0"
1010
def dotty = "0.1.1-bin-20170530-f8f52cc-NIGHTLY"

scalafix-sbt/src/sbt-test/sbt-scalafix/cross-build/build.sbt

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import _root_.scalafix.Versions
2-
updateOptions in ThisBuild := updateOptions.value.withLatestSnapshots(false)
3-
scalacOptions in ThisBuild += "-Ywarn-adapted-args" // For NoAutoTupling
2+
inThisBuild(
3+
List(
4+
updateOptions := updateOptions.value.withLatestSnapshots(false),
5+
scalacOptions += "-Ywarn-adapted-args", // For NoAutoTupling
6+
resolvers += Resolver.sonatypeRepo("releases")
7+
)
8+
)
49
lazy val root = project
510
.in(file("."))
611
.aggregate(

0 commit comments

Comments
 (0)