diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-04-27 09:56:53 -0400 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-04-28 13:34:01 -0400 |
| commit | f515fc42cc95f8638e39d0c1c99882192118c9e2 (patch) | |
| tree | af808ac470df2fcf587769f048e827d9639d854b | |
| parent | e9db891b2c5b9979b20f347387705d9997e71fb8 (diff) | |
| download | cbt-f515fc42cc95f8638e39d0c1c99882192118c9e2.tar.gz cbt-f515fc42cc95f8638e39d0c1c99882192118c9e2.tar.bz2 cbt-f515fc42cc95f8638e39d0c1c99882192118c9e2.zip | |
move version numbers to Scala land (to reduce Java code size)
| -rw-r--r-- | nailgun_launcher/NailgunLauncher.java | 3 | ||||
| -rw-r--r-- | stage1/constants.scala | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/nailgun_launcher/NailgunLauncher.java b/nailgun_launcher/NailgunLauncher.java index d3c7825..8838543 100644 --- a/nailgun_launcher/NailgunLauncher.java +++ b/nailgun_launcher/NailgunLauncher.java @@ -13,9 +13,6 @@ import static cbt.Stage0Lib.*; * dependencies outside the JDK. */ public class NailgunLauncher{ - public static String SCALA_VERSION = "2.11.8"; - public static String SCALA_XML_VERSION = "1.0.5"; - public static String ZINC_VERSION = "0.3.9"; public static String CBT_HOME = System.getenv("CBT_HOME"); public static String NAILGUN = System.getenv("NAILGUN"); diff --git a/stage1/constants.scala b/stage1/constants.scala index 4c39237..437cf19 100644 --- a/stage1/constants.scala +++ b/stage1/constants.scala @@ -1,7 +1,7 @@ package cbt object constants{ - val scalaXmlVersion = NailgunLauncher.SCALA_XML_VERSION - val scalaVersion = NailgunLauncher.SCALA_VERSION - val zincVersion = NailgunLauncher.ZINC_VERSION + val scalaXmlVersion = "1.0.5" + val scalaVersion = "2.11.8" + val zincVersion = "0.3.9" val scalaMajorVersion = scalaVersion.split("\\.").take(2).mkString(".") } |