From b1aad09a43405199b30364deca41df21195a9384 Mon Sep 17 00:00:00 2001 From: Henri Cook Date: Fri, 11 Oct 2019 13:11:34 +0100 Subject: [PATCH 1/2] Use Couriser defaults, which also adds support for COURSIER_REPOSITORIES --- .../dynamic/ScalafmtDynamicDownloader.scala | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtDynamicDownloader.scala b/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtDynamicDownloader.scala index 24b17d062b..d479bb71fa 100644 --- a/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtDynamicDownloader.scala +++ b/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtDynamicDownloader.scala @@ -5,6 +5,7 @@ import java.net.URL import java.nio.file.Path import coursierapi._ + import scala.collection.JavaConverters._ import org.scalafmt.dynamic.ScalafmtDynamicDownloader._ @@ -13,6 +14,7 @@ import scala.util.Try import java.io.OutputStream import java.io.PrintStream import java.io.OutputStreamWriter +import scala.concurrent.JavaConversions._ class ScalafmtDynamicDownloader( downloadProgressWriter: OutputStreamWriter, @@ -75,14 +77,16 @@ class ScalafmtDynamicDownloader( "org.scalameta" } - private def repositories: Array[Repository] = Array( - Repository.central(), - Repository.ivy2Local(), - MavenRepository.of( - "https://oss.sonatype.org/content/repositories/snapshots" - ), - MavenRepository.of("https://oss.sonatype.org/content/repositories/public") - ) + private def repositories: Array[Repository] = { + // Default repositories are ivy2local, central and also anything in COURSIER_REPOSITORIES overrides + Repository.defaults().asScala.toArray ++ Array( + MavenRepository.of( + "https://oss.sonatype.org/content/repositories/snapshots" + ), + MavenRepository.of("https://oss.sonatype.org/content/repositories/public") + ) + } + } object ScalafmtDynamicDownloader { From a5c102fd5d0d5dca92e7ea76e24262eba0af293f Mon Sep 17 00:00:00 2001 From: Henri Cook Date: Fri, 11 Oct 2019 13:29:27 +0100 Subject: [PATCH 2/2] Review comments --- .../scalafmt/dynamic/ScalafmtDynamicDownloader.scala | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtDynamicDownloader.scala b/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtDynamicDownloader.scala index d479bb71fa..d6c0fada2d 100644 --- a/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtDynamicDownloader.scala +++ b/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtDynamicDownloader.scala @@ -1,20 +1,14 @@ package org.scalafmt.dynamic -import java.io.PrintWriter +import java.io.OutputStreamWriter import java.net.URL -import java.nio.file.Path import coursierapi._ - -import scala.collection.JavaConverters._ import org.scalafmt.dynamic.ScalafmtDynamicDownloader._ +import scala.collection.JavaConverters._ import scala.concurrent.duration.Duration import scala.util.Try -import java.io.OutputStream -import java.io.PrintStream -import java.io.OutputStreamWriter -import scala.concurrent.JavaConversions._ class ScalafmtDynamicDownloader( downloadProgressWriter: OutputStreamWriter,