luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-09-04 00:41:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

JDK 1.7 friendliness

Browse Source
This commit is contained in:
Alexandre Archambault
2015-11-28 18:19:42 +01:00
parent 4657991531
commit b0224120fc
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap/src/main/java/coursier/Bootstrap.java
+7 -5
View File
@@ -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<URL>() {
@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;
}
}