diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-09 21:55:24 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-11-09 21:55:24 -0500 |
| commit | bf4e2c5971adadf4506cacb22094225ceae5a8c1 (patch) | |
| tree | 8bde570d7d2810a65a74d934ed4b9422ec4e4370 /stage1 | |
| parent | f2909954253e3976d8f3e8eaaa0e5259f426f727 (diff) | |
| download | cbt-bf4e2c5971adadf4506cacb22094225ceae5a8c1.tar.gz cbt-bf4e2c5971adadf4506cacb22094225ceae5a8c1.tar.bz2 cbt-bf4e2c5971adadf4506cacb22094225ceae5a8c1.zip | |
Remove version from context, we can now use dynamic overrides
Diffstat (limited to 'stage1')
| -rw-r--r-- | stage1/ContextImplementation.scala | 1 | ||||
| -rw-r--r-- | stage1/cbt.scala | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/stage1/ContextImplementation.scala b/stage1/ContextImplementation.scala index c3f25fd..152e606 100644 --- a/stage1/ContextImplementation.scala +++ b/stage1/ContextImplementation.scala @@ -10,7 +10,6 @@ case class ContextImplementation( enabledLoggersArray: Array[String], startCompat: Long, cbtHasChangedCompat: Boolean, - versionOrNull: String, scalaVersionOrNull: String, permanentKeys: ConcurrentHashMap[String,AnyRef], permanentClassLoaders: ConcurrentHashMap[AnyRef,ClassLoader], diff --git a/stage1/cbt.scala b/stage1/cbt.scala index 08394f0..c08a5f3 100644 --- a/stage1/cbt.scala +++ b/stage1/cbt.scala @@ -62,7 +62,6 @@ object `package`{ def args: Seq[String] = argsArray.to def enabledLoggers: Set[String] = enabledLoggersArray.to def scalaVersion = Option(scalaVersionOrNull) - def version = Option(versionOrNull) def parentBuild = Option(parentBuildOrNull) def start: scala.Long = startCompat def cbtHasChanged: scala.Boolean = cbtHasChangedCompat @@ -72,7 +71,6 @@ object `package`{ args: Seq[String] = args, enabledLoggers: Set[String] = enabledLoggers, cbtHasChanged: Boolean = cbtHasChanged, - version: Option[String] = version, scalaVersion: Option[String] = scalaVersion, cache: File = cache, cbtHome: File = cbtHome, @@ -84,7 +82,6 @@ object `package`{ enabledLoggers.to, startCompat, cbtHasChangedCompat, - version.getOrElse(null), scalaVersion.getOrElse(null), permanentKeys, permanentClassLoaders, |