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

SBT 1.1.1 #1102

Merged
merged 1 commit into from
Mar 27, 2018
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 @@ -57,7 +57,7 @@ matrix:
env: SBT_TEST_CMD="^validateDocker"
# workaround for https://github.com/travis-ci/travis-ci/issues/4527
before_script:
- curl -L --create-dirs -o $HOME/.sbt/launchers/1.0.2/sbt-launch.jar http://dl.bintray.com/sbt/maven-releases/org/scala-sbt/sbt-launch/1.0.2/sbt-launch.jar
- curl -L --create-dirs -o $HOME/.sbt/launchers/1.1.1/sbt-launch.jar http://dl.bintray.com/sbt/maven-releases/org/scala-sbt/sbt-launch/1.1.1/sbt-launch.jar

addons:
apt:
Expand Down
9 changes: 4 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ sbtPlugin := true
name := "sbt-native-packager"
organization := "com.typesafe.sbt"

scalaVersion in Global := "2.12.4"
Global / scalaVersion := "2.12.5"

// crossBuildingSettings
crossSbtVersions := Vector("0.13.16", "1.0.0")
crossSbtVersions := Vector("0.13.17", "1.1.1")

scalacOptions in Compile ++= Seq("-deprecation")
Compile / scalacOptions ++= Seq("-deprecation")
javacOptions ++= Seq("-source", "1.8", "-target", "1.8")

// put jdeb on the classpath for scripted tests
Expand All @@ -22,7 +22,7 @@ libraryDependencies ++= Seq(

// sbt dependend libraries
libraryDependencies ++= {
(sbtVersion in pluginCrossBuild).value match {
(pluginCrossBuild / sbtVersion).value match {
case v if v.startsWith("1.") =>
Seq(
"org.scala-sbt" %% "io" % "1.0.0",
Expand Down Expand Up @@ -50,7 +50,6 @@ libraryDependencies ++= {
"org.scala-lang.modules" %% "scala-xml" % "1.0.6"
)
}

}

// configure github page
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.0.2
sbt.version=1.1.1