From dda803085e5bd5cd325a5de0f3a8b946f7e369e1 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 25 Feb 2016 23:00:57 -0500 Subject: [PATCH] Merge --- launch/src/main/input_resources/sbt/sbt.boot.properties | 2 +- src/main/conscript/sbt/launchconfig | 1 - src/main/conscript/scalas/launchconfig | 1 - src/main/conscript/screpl/launchconfig | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/launch/src/main/input_resources/sbt/sbt.boot.properties b/launch/src/main/input_resources/sbt/sbt.boot.properties index 3bbd92970..c19b6aa57 100644 --- a/launch/src/main/input_resources/sbt/sbt.boot.properties +++ b/launch/src/main/input_resources/sbt/sbt.boot.properties @@ -12,10 +12,10 @@ [repositories] local - jcenter: https://jcenter.bintray.com/ 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 +${{repositories}} [boot] directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} diff --git a/src/main/conscript/sbt/launchconfig b/src/main/conscript/sbt/launchconfig index 81d7bfd1b..033dc550b 100644 --- a/src/main/conscript/sbt/launchconfig +++ b/src/main/conscript/sbt/launchconfig @@ -12,7 +12,6 @@ [repositories] local - jcenter: https://jcenter.bintray.com/ 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 diff --git a/src/main/conscript/scalas/launchconfig b/src/main/conscript/scalas/launchconfig index ff63d0fa8..0d0d5664c 100644 --- a/src/main/conscript/scalas/launchconfig +++ b/src/main/conscript/scalas/launchconfig @@ -12,7 +12,6 @@ [repositories] local - jcenter: https://jcenter.bintray.com/ 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 diff --git a/src/main/conscript/screpl/launchconfig b/src/main/conscript/screpl/launchconfig index ffdf06ee8..afa5eb125 100644 --- a/src/main/conscript/screpl/launchconfig +++ b/src/main/conscript/screpl/launchconfig @@ -12,7 +12,6 @@ [repositories] local - jcenter: https://jcenter.bintray.com/ 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