Skip to content

Version updates and changes #190

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 1, 2017
Merged

Version updates and changes #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ env:
- TEST_COMMAND="test"
- TEST_COMMAND="scripted"
- TEST_COMMAND="testFunctional"
- TEST_COMMAND="-Dmima.testScalaVersion=2.11.8 testFunctional"
- TEST_COMMAND="-Dmima.testScalaVersion=2.12.1 testFunctional"
- TEST_COMMAND="-Dmima.testScalaVersion=2.11.11 testFunctional"
- TEST_COMMAND="-Dmima.testScalaVersion=2.12.3 testFunctional"
- TEST_COMMAND="it:test"
- TEST_COMMAND="mimaReportBinaryIssues"
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.2 ^^1.0.0-RC2 test"
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.2 ^^1.0.0-RC2 scripted"
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.2 testFunctional"
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.2 it:test"
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.2 ^^1.0.0-RC2 mimaReportBinaryIssues"
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.3 ^^1.0.0-RC3 test"
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.3 ^^1.0.0-RC3 scripted"
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.3 testFunctional"
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.3 it:test"
- TEST_COMMAND="-Dmima.buildScalaVersion=2.12.3 ^^1.0.0-RC3 mimaReportBinaryIssues"

script:
- sbt $TEST_COMMAND
Expand Down
5 changes: 4 additions & 1 deletion project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ object MimaBuild {
publish := (),
publishLocal := (),
publishSigned := (),
crossSbtVersions := List("0.13.16-RC1", "1.0.0-RC2"),
sbtVersion in Global := "0.13.13", // Should be ThisBuild, but ^^ uses Global (incorrectly)
inThisBuild(Seq(
crossSbtVersions := List("0.13.13", "1.0.0-RC3")
)),
testScalaVersion in Global := sys.props.getOrElse("mima.testScalaVersion", scalaVersion.value)
)
enablePlugins(GitVersioning)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.16-RC1
sbt.version=0.13.16
4 changes: 4 additions & 0 deletions sbtplugin/src/main/scala-sbt-0.13/compat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ package sbt

object compat {
val scalaModuleInfo = SettingKey[Option[librarymanagement.ScalaModuleInfo]]("ivyScala")

implicit class ModuleIdOps(val _m: ModuleID) extends AnyVal {
def withName(n: String): ModuleID = _m copy (name = n)
}
}

package librarymanagement {
Expand Down