remove jdk8 dependencies, force jdk7, remove unnecessary cache folders

3 files changed, 12 insertions, 6 deletions

diff --git a/circle.yml b/circle.yml
index 35620d8..7d7be3e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,11 +1,9 @@
 machine:
   java:
-    version: oraclejdk8
+    version: oraclejdk7
 
 dependencies:
   cache_directories:
-    - "bootstrap_scala/cache"
-    - "bootstrap_scala/target"
     - "cache"
     - "nailgun_launcher/target"
     - "stage1/target"
diff --git a/nailgun_launcher/CBTUrlClassLoader.java b/nailgun_launcher/CBTUrlClassLoader.java
index 88bf4a3..a44e653 100644
--- a/nailgun_launcher/CBTUrlClassLoader.java
+++ b/nailgun_launcher/CBTUrlClassLoader.java
@@ -9,7 +9,7 @@ class CbtURLClassLoader extends java.net.URLClassLoader{
       + "(\n  "
       + Arrays.toString(getURLs())
       + ",\n  "
-      + String.join("\n  ",getParent().toString().split("\n"))
+      + NailgunLauncher.join("\n  ",getParent().toString().split("\n"))
       + "\n)"
     );
   }
diff --git a/nailgun_launcher/NailgunLauncher.java b/nailgun_launcher/NailgunLauncher.java
index 50a3c91..de55821 100644
--- a/nailgun_launcher/NailgunLauncher.java
+++ b/nailgun_launcher/NailgunLauncher.java
@@ -179,8 +179,8 @@ public class NailgunLauncher{
       classLoaderCacheKeys.get( key )
     );
   }
-  static ClassLoader cachePut( ClassLoader classLoader, String... jars ){
-    String key = String.join( pathSeparator, jars );
+  public static ClassLoader cachePut( ClassLoader classLoader, String... jars ){
+    String key = join( pathSeparator, jars );
     Object keyObject = new Object();
     classLoaderCacheKeys.put( key, keyObject );
     classLoaderCacheValues.put( keyObject, classLoader );
@@ -211,4 +211,12 @@ public class NailgunLauncher{
     sha1.update(bytes, 0, bytes.length);
     return (new HexBinaryAdapter()).marshal(sha1.digest());
   }
+
+  public static String join(String separator, String[] parts){
+    String result = parts[0];
+    for(int i = 1; i < parts.length; i++){
+      result += separator + parts[i];
+    }
+    return result;
+  }
 }