Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for v0.5.1 #371

Merged
merged 3 commits into from
Sep 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
- CI_TEST: ci-slow
CI_SCALA_VERSION: 2.11.11
- CI_TEST: scalafmt
- CI_TEST: mimaReportBinaryIssues
- CI_TEST: mima

cache:
directories:
Expand Down
11 changes: 8 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ commands += Command.command("ci-slow") { s =>
"scalafix-sbt/it:test" ::
s
}
commands += Command.command("mima") { s =>
"very mimaReportBinaryIssues" ::
s
}

lazy val adhocRepoUri = sys.props("scalafix.repository.uri")
lazy val adhocRepoCredentials = sys.props("scalafix.repository.credentials")
Expand Down Expand Up @@ -66,14 +70,13 @@ lazy val publishSettings = Seq(
)
),
mimaPreviousArtifacts := {
val previousArtifactVersion = "0.5.0"
// NOTE(olafur) shudder, can't figure out simpler way to do the same.
val binaryVersion =
if (crossVersion.value.isInstanceOf[CrossVersion.Full]) scalaVersion.value
else scalaBinaryVersion.value
Set(
organization.value %
s"${moduleName.value}_$binaryVersion" %
sys.props.getOrElse("scalafix.stable.version", stableVersion.value)
organization.value % s"${moduleName.value}_$binaryVersion" % previousArtifactVersion
)
},
mimaBinaryIssueFilters ++= Mima.ignoredABIProblems,
Expand All @@ -88,6 +91,8 @@ lazy val publishSettings = Seq(
)

lazy val noPublish = allSettings ++ Seq(
mimaReportBinaryIssues := {},
mimaPreviousArtifacts := Set.empty,
publishArtifact := false,
publish := {},
publishLocal := {}
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._

object Dependencies {

val scalametaV = "2.0.0-RC3"
val scalametaV = "2.0.1"
val metaconfigV = "0.5.2"
def semanticdbSbt = "0.4.0"
def dotty = "0.1.1-bin-20170530-f8f52cc-NIGHTLY"
Expand Down
9 changes: 7 additions & 2 deletions scalafix-sbt/src/sbt-test/sbt-scalafix/cross-build/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import _root_.scalafix.Versions
updateOptions in ThisBuild := updateOptions.value.withLatestSnapshots(false)
scalacOptions in ThisBuild += "-Ywarn-adapted-args" // For NoAutoTupling
inThisBuild(
List(
updateOptions := updateOptions.value.withLatestSnapshots(false),
scalacOptions += "-Ywarn-adapted-args", // For NoAutoTupling
resolvers += Resolver.sonatypeRepo("releases")
)
)
lazy val root = project
.in(file("."))
.aggregate(
Expand Down