From b0224120fc5206b74b0c37db9b791e339a68834a Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Sat, 28 Nov 2015 17:56:55 +0100 Subject: [PATCH] JDK 1.7 friendliness --- .../src/main/java/coursier/Bootstrap.java | 12 +++++++----- build.sbt | 8 +++++++- coursier | Bin 8012 -> 8015 bytes 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bootstrap/src/main/java/coursier/Bootstrap.java b/bootstrap/src/main/java/coursier/Bootstrap.java index 8222ea293..4c1035d38 100644 --- a/bootstrap/src/main/java/coursier/Bootstrap.java +++ b/bootstrap/src/main/java/coursier/Bootstrap.java @@ -74,7 +74,7 @@ public class Bootstrap { for (int i = offset + 2; i < args.length; i++) remainingArgs.add(args[i]); - File jarDir = new File(jarDir0); + final File jarDir = new File(jarDir0); if (jarDir.exists()) { if (!jarDir.isDirectory()) @@ -123,26 +123,28 @@ public class Bootstrap { for (URL url : urls) { if (!url.getProtocol().equals("file")) { + final URL url0 = url; + completionService.submit(new Callable() { @Override public URL call() throws Exception { - String path = url.getPath(); + String path = url0.getPath(); int idx = path.lastIndexOf('/'); // FIXME Add other components in path to prevent conflicts? String fileName = path.substring(idx + 1); File dest = new File(jarDir, fileName); if (!dest.exists()) { - System.err.println("Downloading " + url); + System.err.println("Downloading " + url0); try { - URLConnection conn = url.openConnection(); + URLConnection conn = url0.openConnection(); long lastModified = conn.getLastModified(); InputStream s = conn.getInputStream(); byte[] b = readFullySync(s); Files.write(dest.toPath(), b); dest.setLastModified(lastModified); } catch (Exception e) { - System.err.println("Error while downloading " + url + ": " + e.getMessage() + ", ignoring it"); + System.err.println("Error while downloading " + url0 + ": " + e.getMessage() + ", ignoring it"); throw e; } } diff --git a/build.sbt b/build.sbt index fe825db36..42f5c9f3f 100644 --- a/build.sbt +++ b/build.sbt @@ -46,6 +46,11 @@ lazy val baseCommonSettings = Seq( "Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases", Resolver.sonatypeRepo("releases"), Resolver.sonatypeRepo("snapshots") + ), + scalacOptions += "-target:jvm-1.7", + javacOptions ++= Seq( + "-source", "1.7", + "-target", "1.7" ) ) @@ -173,7 +178,8 @@ lazy val bootstrap = project artifactName0(sv, m, artifact) }, crossPaths := false, - autoScalaLibrary := false + autoScalaLibrary := false, + javacOptions in doc := Seq() ) lazy val `coursier` = project.in(file(".")) diff --git a/coursier b/coursier index c73f9338ef7daa34e04e4c0327e6bb89b6e34859..5d8afc47d4c6b57ab781a4dcc66fec5a6711465a 100755 GIT binary patch delta 5284 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 delta 5283 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 e%#!<