aboutsummaryrefslogtreecommitdiff
path: root/nailgun_launcher
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-11-27 22:05:01 +0000
committerChristopher Vogt <oss.nsp@cvogt.org>2016-11-29 11:42:18 -0500
commit8939ebef01ae7a665781d99331e4d13e7b875a96 (patch)
tree5ca029dbbe63434422de5a41bd138005bf4723b3 /nailgun_launcher
parent2c2902bb347dc832863569ece3bb01150d6b7665 (diff)
downloadcbt-8939ebef01ae7a665781d99331e4d13e7b875a96.tar.gz
cbt-8939ebef01ae7a665781d99331e4d13e7b875a96.tar.bz2
cbt-8939ebef01ae7a665781d99331e4d13e7b875a96.zip
Update early dependencies to new zinc
Diffstat (limited to 'nailgun_launcher')
-rw-r--r--nailgun_launcher/EarlyDependencies.java168
-rw-r--r--nailgun_launcher/Stage0Lib.java4
2 files changed, 86 insertions, 86 deletions
diff --git a/nailgun_launcher/EarlyDependencies.java b/nailgun_launcher/EarlyDependencies.java
index 4ffbdfd..8f1962b 100644
--- a/nailgun_launcher/EarlyDependencies.java
+++ b/nailgun_launcher/EarlyDependencies.java
@@ -19,13 +19,13 @@ class EarlyDependencies{
String scalaCompiler_2_11_8_File;
String scalaXml_1_0_5_File;
String scalaLibrary_2_11_8_File;
- String zinc_0_3_9_File;
- String incrementalCompiler_0_13_9_File;
- String compilerInterface_0_13_9_File;
- String scalaCompiler_2_10_5_File;
- String sbtInterface_0_13_9_File;
- String scalaReflect_2_10_5_File;
- String scalaLibrary_2_10_5_File;
+ String zinc_0_3_12_File;
+ String incrementalCompiler_0_13_12_File;
+ String compilerInterface_0_13_12_File;
+ String scalaCompiler_2_10_6_File;
+ String sbtInterface_0_13_12_File;
+ String scalaReflect_2_10_6_File;
+ String scalaLibrary_2_10_6_File;
public EarlyDependencies(
String mavenCache, String mavenUrl, ClassLoaderCache2<ClassLoader> classLoaderCache, ClassLoader rootClassLoader
@@ -34,86 +34,86 @@ class EarlyDependencies{
scalaCompiler_2_11_8_File = mavenCache + "/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8.jar";
scalaXml_1_0_5_File = mavenCache + "/org/scala-lang/modules/scala-xml_2.11/1.0.5/scala-xml_2.11-1.0.5.jar";
scalaLibrary_2_11_8_File = mavenCache + "/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jar";
- zinc_0_3_9_File = mavenCache + "/com/typesafe/zinc/zinc/0.3.9/zinc-0.3.9.jar";
- incrementalCompiler_0_13_9_File = mavenCache + "/com/typesafe/sbt/incremental-compiler/0.13.9/incremental-compiler-0.13.9.jar";
- compilerInterface_0_13_9_File = mavenCache + "/com/typesafe/sbt/compiler-interface/0.13.9/compiler-interface-0.13.9-sources.jar";
- scalaCompiler_2_10_5_File = mavenCache + "/org/scala-lang/scala-compiler/2.10.5/scala-compiler-2.10.5.jar";
- sbtInterface_0_13_9_File = mavenCache + "/com/typesafe/sbt/sbt-interface/0.13.9/sbt-interface-0.13.9.jar";
- scalaReflect_2_10_5_File = mavenCache + "/org/scala-lang/scala-reflect/2.10.5/scala-reflect-2.10.5.jar";
- scalaLibrary_2_10_5_File = mavenCache + "/org/scala-lang/scala-library/2.10.5/scala-library-2.10.5.jar";
+ zinc_0_3_12_File = mavenCache + "/com/typesafe/zinc/zinc/0.3.12/zinc-0.3.12.jar";
+ incrementalCompiler_0_13_12_File = mavenCache + "/com/typesafe/sbt/incremental-compiler/0.13.12/incremental-compiler-0.13.12.jar";
+ compilerInterface_0_13_12_File = mavenCache + "/com/typesafe/sbt/compiler-interface/0.13.12/compiler-interface-0.13.12-sources.jar";
+ scalaCompiler_2_10_6_File = mavenCache + "/org/scala-lang/scala-compiler/2.10.6/scala-compiler-2.10.6.jar";
+ sbtInterface_0_13_12_File = mavenCache + "/com/typesafe/sbt/sbt-interface/0.13.12/sbt-interface-0.13.12.jar";
+ scalaReflect_2_10_6_File = mavenCache + "/org/scala-lang/scala-reflect/2.10.6/scala-reflect-2.10.6.jar";
+ scalaLibrary_2_10_6_File = mavenCache + "/org/scala-lang/scala-library/2.10.6/scala-library-2.10.6.jar";
download(new URL(mavenUrl + "/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8.jar"), Paths.get(scalaReflect_2_11_8_File), "b74530deeba742ab4f3134de0c2da0edc49ca361");
download(new URL(mavenUrl + "/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8.jar"), Paths.get(scalaCompiler_2_11_8_File), "fe1285c9f7b58954c5ef6d80b59063569c065e9a");
- // org.scala-lang:scala-library:2.10.5
- download(new URL(mavenUrl + "/org/scala-lang/scala-library/2.10.5/scala-library-2.10.5.jar"), Paths.get(scalaLibrary_2_10_5_File), "57ac67a6cf6fd591e235c62f8893438e8d10431d");
-
- String[] scalaLibrary_2_10_5_ClasspathArray = new String[]{scalaLibrary_2_10_5_File};
- String scalaLibrary_2_10_5_Classpath = classpath( scalaLibrary_2_10_5_ClasspathArray );
- ClassLoader scalaLibrary_2_10_5_ =
- classLoaderCache.contains( scalaLibrary_2_10_5_Classpath )
- ? classLoaderCache.get( scalaLibrary_2_10_5_Classpath )
- : classLoaderCache.put( classLoader( scalaLibrary_2_10_5_File, rootClassLoader ), scalaLibrary_2_10_5_Classpath );
-
- // org.scala-lang:scala-reflect:2.10.5
- download(new URL(mavenUrl + "/org/scala-lang/scala-reflect/2.10.5/scala-reflect-2.10.5.jar"), Paths.get(scalaReflect_2_10_5_File), "7392facb48876c67a89fcb086112b195f5f6bbc3");
-
- String[] scalaReflect_2_10_5_ClasspathArray = new String[]{scalaLibrary_2_10_5_File, scalaReflect_2_10_5_File};
- String scalaReflect_2_10_5_Classpath = classpath( scalaReflect_2_10_5_ClasspathArray );
- ClassLoader scalaReflect_2_10_5_ =
- classLoaderCache.contains( scalaReflect_2_10_5_Classpath )
- ? classLoaderCache.get( scalaReflect_2_10_5_Classpath )
- : classLoaderCache.put( classLoader( scalaReflect_2_10_5_File, scalaLibrary_2_10_5_ ), scalaReflect_2_10_5_Classpath );
-
- // com.typesafe.sbt:sbt-interface:0.13.9
- download(new URL(mavenUrl + "/com/typesafe/sbt/sbt-interface/0.13.9/sbt-interface-0.13.9.jar"), Paths.get(sbtInterface_0_13_9_File), "29848631415402c81b732e919be88f268df37250");
-
- String[] sbtInterface_0_13_9_ClasspathArray = new String[]{sbtInterface_0_13_9_File, scalaLibrary_2_10_5_File, scalaReflect_2_10_5_File};
- String sbtInterface_0_13_9_Classpath = classpath( sbtInterface_0_13_9_ClasspathArray );
- ClassLoader sbtInterface_0_13_9_ =
- classLoaderCache.contains( sbtInterface_0_13_9_Classpath )
- ? classLoaderCache.get( sbtInterface_0_13_9_Classpath )
- : classLoaderCache.put( classLoader( sbtInterface_0_13_9_File, scalaReflect_2_10_5_ ), sbtInterface_0_13_9_Classpath );
-
- // org.scala-lang:scala-compiler:2.10.5
- download(new URL(mavenUrl + "/org/scala-lang/scala-compiler/2.10.5/scala-compiler-2.10.5.jar"), Paths.get(scalaCompiler_2_10_5_File), "f0f5bb444ca26a6e489af3dd35e24f7e2d2d118e");
-
- String[] scalaCompiler_2_10_5_ClasspathArray = new String[]{sbtInterface_0_13_9_File, scalaCompiler_2_10_5_File, scalaLibrary_2_10_5_File, scalaReflect_2_10_5_File};
- String scalaCompiler_2_10_5_Classpath = classpath( scalaCompiler_2_10_5_ClasspathArray );
- ClassLoader scalaCompiler_2_10_5_ =
- classLoaderCache.contains( scalaCompiler_2_10_5_Classpath )
- ? classLoaderCache.get( scalaCompiler_2_10_5_Classpath )
- : classLoaderCache.put( classLoader( scalaCompiler_2_10_5_File, sbtInterface_0_13_9_ ), scalaCompiler_2_10_5_Classpath );
-
- // com.typesafe.sbt:compiler-interface:0.13.9
- download(new URL(mavenUrl + "/com/typesafe/sbt/compiler-interface/0.13.9/compiler-interface-0.13.9-sources.jar"), Paths.get(compilerInterface_0_13_9_File), "2311addbed1182916ad00f83c57c0eeca1af382b");
-
- String[] compilerInterface_0_13_9_ClasspathArray = new String[]{compilerInterface_0_13_9_File, sbtInterface_0_13_9_File, scalaCompiler_2_10_5_File, scalaLibrary_2_10_5_File, scalaReflect_2_10_5_File};
- String compilerInterface_0_13_9_Classpath = classpath( compilerInterface_0_13_9_ClasspathArray );
- ClassLoader compilerInterface_0_13_9_ =
- classLoaderCache.contains( compilerInterface_0_13_9_Classpath )
- ? classLoaderCache.get( compilerInterface_0_13_9_Classpath )
- : classLoaderCache.put( classLoader( compilerInterface_0_13_9_File, scalaCompiler_2_10_5_ ), compilerInterface_0_13_9_Classpath );
-
- // com.typesafe.sbt:incremental-compiler:0.13.9
- download(new URL(mavenUrl + "/com/typesafe/sbt/incremental-compiler/0.13.9/incremental-compiler-0.13.9.jar"), Paths.get(incrementalCompiler_0_13_9_File), "fbbf1cadbed058aa226643e83543c35de43b13f0");
-
- String[] incrementalCompiler_0_13_9_ClasspathArray = new String[]{compilerInterface_0_13_9_File, incrementalCompiler_0_13_9_File, sbtInterface_0_13_9_File, scalaCompiler_2_10_5_File, scalaLibrary_2_10_5_File, scalaReflect_2_10_5_File};
- String incrementalCompiler_0_13_9_Classpath = classpath( incrementalCompiler_0_13_9_ClasspathArray );
- ClassLoader incrementalCompiler_0_13_9_ =
- classLoaderCache.contains( incrementalCompiler_0_13_9_Classpath )
- ? classLoaderCache.get( incrementalCompiler_0_13_9_Classpath )
- : classLoaderCache.put( classLoader( incrementalCompiler_0_13_9_File, compilerInterface_0_13_9_ ), incrementalCompiler_0_13_9_Classpath );
-
- // com.typesafe.zinc:zinc:0.3.9
- download(new URL(mavenUrl + "/com/typesafe/zinc/zinc/0.3.9/zinc-0.3.9.jar"), Paths.get(zinc_0_3_9_File), "46a4556d1f36739879f4b2cc19a73d12b3036e9a");
-
- String[] zinc_0_3_9_ClasspathArray = new String[]{compilerInterface_0_13_9_File, incrementalCompiler_0_13_9_File, sbtInterface_0_13_9_File, zinc_0_3_9_File, scalaCompiler_2_10_5_File, scalaLibrary_2_10_5_File, scalaReflect_2_10_5_File};
- String zinc_0_3_9_Classpath = classpath( zinc_0_3_9_ClasspathArray );
- ClassLoader zinc_0_3_9_ =
- classLoaderCache.contains( zinc_0_3_9_Classpath )
- ? classLoaderCache.get( zinc_0_3_9_Classpath )
- : classLoaderCache.put( classLoader( zinc_0_3_9_File, incrementalCompiler_0_13_9_ ), zinc_0_3_9_Classpath );
+ // org.scala-lang:scala-library:2.10.6
+ download(new URL(mavenUrl + "/org/scala-lang/scala-library/2.10.6/scala-library-2.10.6.jar"), Paths.get(scalaLibrary_2_10_6_File), "421989aa8f95a05a4f894630aad96b8c7b828732");
+
+ String[] scalaLibrary_2_10_6_ClasspathArray = new String[]{scalaLibrary_2_10_6_File};
+ String scalaLibrary_2_10_6_Classpath = classpath( scalaLibrary_2_10_6_ClasspathArray );
+ ClassLoader scalaLibrary_2_10_6_ =
+ classLoaderCache.contains( scalaLibrary_2_10_6_Classpath )
+ ? classLoaderCache.get( scalaLibrary_2_10_6_Classpath )
+ : classLoaderCache.put( classLoader( scalaLibrary_2_10_6_File, rootClassLoader ), scalaLibrary_2_10_6_Classpath );
+
+ // org.scala-lang:scala-reflect:2.10.6
+ download(new URL(mavenUrl + "/org/scala-lang/scala-reflect/2.10.6/scala-reflect-2.10.6.jar"), Paths.get(scalaReflect_2_10_6_File), "3259f3df0f166f017ef5b2d385445808398c316c");
+
+ String[] scalaReflect_2_10_6_ClasspathArray = new String[]{scalaLibrary_2_10_6_File, scalaReflect_2_10_6_File};
+ String scalaReflect_2_10_6_Classpath = classpath( scalaReflect_2_10_6_ClasspathArray );
+ ClassLoader scalaReflect_2_10_6_ =
+ classLoaderCache.contains( scalaReflect_2_10_6_Classpath )
+ ? classLoaderCache.get( scalaReflect_2_10_6_Classpath )
+ : classLoaderCache.put( classLoader( scalaReflect_2_10_6_File, scalaLibrary_2_10_6_ ), scalaReflect_2_10_6_Classpath );
+
+ // com.typesafe.sbt:sbt-interface:0.13.12
+ download(new URL(mavenUrl + "/com/typesafe/sbt/sbt-interface/0.13.12/sbt-interface-0.13.12.jar"), Paths.get(sbtInterface_0_13_12_File), "fcc7875c02f0d4641fac0518121bd71475d3909b");
+
+ String[] sbtInterface_0_13_12_ClasspathArray = new String[]{sbtInterface_0_13_12_File, scalaLibrary_2_10_6_File, scalaReflect_2_10_6_File};
+ String sbtInterface_0_13_12_Classpath = classpath( sbtInterface_0_13_12_ClasspathArray );
+ ClassLoader sbtInterface_0_13_12_ =
+ classLoaderCache.contains( sbtInterface_0_13_12_Classpath )
+ ? classLoaderCache.get( sbtInterface_0_13_12_Classpath )
+ : classLoaderCache.put( classLoader( sbtInterface_0_13_12_File, scalaReflect_2_10_6_ ), sbtInterface_0_13_12_Classpath );
+
+ // org.scala-lang:scala-compiler:2.10.6
+ download(new URL(mavenUrl + "/org/scala-lang/scala-compiler/2.10.6/scala-compiler-2.10.6.jar"), Paths.get(scalaCompiler_2_10_6_File), "9b15174852f5b6bb1edbf303d5722286a0a54011");
+
+ String[] scalaCompiler_2_10_6_ClasspathArray = new String[]{sbtInterface_0_13_12_File, scalaCompiler_2_10_6_File, scalaLibrary_2_10_6_File, scalaReflect_2_10_6_File};
+ String scalaCompiler_2_10_6_Classpath = classpath( scalaCompiler_2_10_6_ClasspathArray );
+ ClassLoader scalaCompiler_2_10_6_ =
+ classLoaderCache.contains( scalaCompiler_2_10_6_Classpath )
+ ? classLoaderCache.get( scalaCompiler_2_10_6_Classpath )
+ : classLoaderCache.put( classLoader( scalaCompiler_2_10_6_File, sbtInterface_0_13_12_ ), scalaCompiler_2_10_6_Classpath );
+
+ // com.typesafe.sbt:compiler-interface:0.13.12
+ download(new URL(mavenUrl + "/com/typesafe/sbt/compiler-interface/0.13.12/compiler-interface-0.13.12-sources.jar"), Paths.get(compilerInterface_0_13_12_File), "d9c3270576e162bf017b146af262364c2db87a32");
+
+ String[] compilerInterface_0_13_12_ClasspathArray = new String[]{compilerInterface_0_13_12_File, sbtInterface_0_13_12_File, scalaCompiler_2_10_6_File, scalaLibrary_2_10_6_File, scalaReflect_2_10_6_File};
+ String compilerInterface_0_13_12_Classpath = classpath( compilerInterface_0_13_12_ClasspathArray );
+ ClassLoader compilerInterface_0_13_12_ =
+ classLoaderCache.contains( compilerInterface_0_13_12_Classpath )
+ ? classLoaderCache.get( compilerInterface_0_13_12_Classpath )
+ : classLoaderCache.put( classLoader( compilerInterface_0_13_12_File, scalaCompiler_2_10_6_ ), compilerInterface_0_13_12_Classpath );
+
+ // com.typesafe.sbt:incremental-compiler:0.13.12
+ download(new URL(mavenUrl + "/com/typesafe/sbt/incremental-compiler/0.13.12/incremental-compiler-0.13.12.jar"), Paths.get(incrementalCompiler_0_13_12_File), "259f6d24a5a3791bb233787d6a8e639c4ab86fe5");
+
+ String[] incrementalCompiler_0_13_12_ClasspathArray = new String[]{compilerInterface_0_13_12_File, incrementalCompiler_0_13_12_File, sbtInterface_0_13_12_File, scalaCompiler_2_10_6_File, scalaLibrary_2_10_6_File, scalaReflect_2_10_6_File};
+ String incrementalCompiler_0_13_12_Classpath = classpath( incrementalCompiler_0_13_12_ClasspathArray );
+ ClassLoader incrementalCompiler_0_13_12_ =
+ classLoaderCache.contains( incrementalCompiler_0_13_12_Classpath )
+ ? classLoaderCache.get( incrementalCompiler_0_13_12_Classpath )
+ : classLoaderCache.put( classLoader( incrementalCompiler_0_13_12_File, compilerInterface_0_13_12_ ), incrementalCompiler_0_13_12_Classpath );
+
+ // com.typesafe.zinc:zinc:0.3.12
+ download(new URL(mavenUrl + "/com/typesafe/zinc/zinc/0.3.12/zinc-0.3.12.jar"), Paths.get(zinc_0_3_12_File), "c4339e93f5b7273f49ad026248f4fdb1d4d6c7c4");
+
+ String[] zinc_0_3_12_ClasspathArray = new String[]{compilerInterface_0_13_12_File, incrementalCompiler_0_13_12_File, sbtInterface_0_13_12_File, zinc_0_3_12_File, scalaCompiler_2_10_6_File, scalaLibrary_2_10_6_File, scalaReflect_2_10_6_File};
+ String zinc_0_3_12_Classpath = classpath( zinc_0_3_12_ClasspathArray );
+ ClassLoader zinc_0_3_12_ =
+ classLoaderCache.contains( zinc_0_3_12_Classpath )
+ ? classLoaderCache.get( zinc_0_3_12_Classpath )
+ : classLoaderCache.put( classLoader( zinc_0_3_12_File, incrementalCompiler_0_13_12_ ), zinc_0_3_12_Classpath );
// org.scala-lang:scala-library:2.11.8
download(new URL(mavenUrl + "/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jar"), Paths.get(scalaLibrary_2_11_8_File), "ddd5a8bced249bedd86fb4578a39b9fb71480573");
@@ -138,6 +138,6 @@ class EarlyDependencies{
classLoader = scalaXml_1_0_5_;
classpathArray = scalaXml_1_0_5_ClasspathArray;
- zinc = zinc_0_3_9_;
+ zinc = zinc_0_3_12_;
}
}
diff --git a/nailgun_launcher/Stage0Lib.java b/nailgun_launcher/Stage0Lib.java
index 452bdae..865b1cb 100644
--- a/nailgun_launcher/Stage0Lib.java
+++ b/nailgun_launcher/Stage0Lib.java
@@ -72,8 +72,8 @@ public class Stage0Lib{
"-scala-compiler", earlyDeps.scalaCompiler_2_11_8_File,
"-scala-library", earlyDeps.scalaLibrary_2_11_8_File,
"-scala-extra", earlyDeps.scalaReflect_2_11_8_File,
- "-sbt-interface", earlyDeps.sbtInterface_0_13_9_File,
- "-compiler-interface", earlyDeps.compilerInterface_0_13_9_File,
+ "-sbt-interface", earlyDeps.sbtInterface_0_13_12_File,
+ "-compiler-interface", earlyDeps.compilerInterface_0_13_12_File,
"-cp", classpath,
"-d", target,
"-S-deprecation",