Skip to content

Commit

Permalink
Fix mozart#325: Upgrade to sbt 1.3.2 and Scala 2.11.12.
Browse files Browse the repository at this point in the history
Since sbt-onejar does not have support for sbt 1.x, we switch to
using sbt-assembly instead.
  • Loading branch information
sjrd committed Oct 4, 2019
1 parent db41d83 commit 46a23c8
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions bootcompiler/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ set(SBT "${Java_JAVA_EXECUTABLE}" ${SBT_JAVA_OPTS} -Dfile.encoding=UTF-8

file(GLOB_RECURSE bootcompiler_sources src/*)
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/bootcompiler.jar"
COMMAND ${SBT} oneJar
COMMAND ${SBT} assembly
COMMAND ${CMAKE_COMMAND} -E copy
"${CMAKE_CURRENT_SOURCE_DIR}/target/scala-2.11/bootcompiler_2.11-2.0-SNAPSHOT-one-jar.jar"
"${CMAKE_CURRENT_SOURCE_DIR}/target/scala-2.11/bootcompiler-assembly-2.0-SNAPSHOT.jar"
"${CMAKE_CURRENT_BINARY_DIR}/bootcompiler.jar"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS "sbt-launch.jar" "build.sbt" "project/plugins.sbt" ${bootcompiler_sources}
Expand Down
4 changes: 1 addition & 3 deletions bootcompiler/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@ name := "bootcompiler"

version := "2.0-SNAPSHOT"

scalaVersion := "2.11.2"
scalaVersion := "2.11.12"

scalacOptions ++= Seq("-deprecation", "-optimize")

libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.2"

libraryDependencies += "com.github.scopt" %% "scopt" % "3.2.0"

seq(com.github.retronym.SbtOneJar.oneJarSettings: _*)

// Work around a bug that prevents generating documentation
unmanagedClasspath in Compile +=
Attributed.blank(new java.io.File("doesnotexist"))
2 changes: 1 addition & 1 deletion bootcompiler/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.6
sbt.version=1.3.2
2 changes: 1 addition & 1 deletion bootcompiler/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.github.retronym" % "sbt-onejar" % "0.8")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
Binary file modified bootcompiler/sbt-launch.jar
100644 → 100755
Binary file not shown.

0 comments on commit 46a23c8

Please sign in to comment.