diff --git a/launch/src/main/input_resources/sbt/sbt.boot.properties b/launch/src/main/input_resources/sbt/sbt.boot.properties index 9234be5f8..7a10ad53c 100644 --- a/launch/src/main/input_resources/sbt/sbt.boot.properties +++ b/launch/src/main/input_resources/sbt/sbt.boot.properties @@ -1,5 +1,5 @@ [scala] - version: ${sbt.scala.version-auto} + version: 2.11.8 [app] org: ${sbt.organization-${{org}}} @@ -7,7 +7,7 @@ version: ${sbt.version-read(sbt.version)[${{sbt.version}}]} class: ${sbt.main.class-sbt.xMain} components: xsbti,extra - cross-versioned: ${sbt.cross.versioned-false} + cross-versioned: ${sbt.cross.versioned-binary} resources: ${sbt.extraClasspath-} [repositories] diff --git a/launch/src/main/resources/sbt.boot.properties0.13.0 b/launch/src/main/resources/sbt.boot.properties0.13.0 new file mode 100644 index 000000000..b1d906481 --- /dev/null +++ b/launch/src/main/resources/sbt.boot.properties0.13.0 @@ -0,0 +1,26 @@ +[scala] + version: 2.10.6 + +[app] + org: ${sbt.organization-org.scala-sbt} + name: sbt + version: ${sbt.version-read(sbt.version)[0.13.9]} + class: sbt.xMain + components: xsbti,extra + cross-versioned: ${sbt.cross.versioned-false} + resources: ${sbt.extraClasspath-} + +[repositories] + local + maven-central + typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly + sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly + +[boot] + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + +[ivy] + ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} + checksums: ${sbt.checksums-sha1,md5} + override-build-repos: ${sbt.override.build.repos-false} + repository-config: ${sbt.repository.config-${sbt.global.base-${user.home}/.sbt}/repositories} diff --git a/sbt/src/sbt-test/project/default-settings/build.sbt b/sbt/src/sbt-test/project/default-settings/build.sbt index 48dd37168..eb3cb4c16 100644 --- a/sbt/src/sbt-test/project/default-settings/build.sbt +++ b/sbt/src/sbt-test/project/default-settings/build.sbt @@ -1,5 +1,10 @@ val root = (project in file(".")) +TaskKey[Unit]("checkScalaVersion", "test") := { + val sv = scalaVersion.value + assert(sv startsWith "2.11.", s"Found $sv!") +} + TaskKey[Unit]("checkArtifacts", "test") := { val arts = packagedArtifacts.value assert(arts.nonEmpty, "Packaged artifacts must not be empty!") diff --git a/sbt/src/sbt-test/project/default-settings/test b/sbt/src/sbt-test/project/default-settings/test index 6a559c60a..d55f0991d 100644 --- a/sbt/src/sbt-test/project/default-settings/test +++ b/sbt/src/sbt-test/project/default-settings/test @@ -1 +1,2 @@ > checkArtifacts +> checkScalaVersion