luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Take ivyPaths into account

This commit is contained in:
Alexandre Archambault 2019-05-14 13:31:12 +02:00
parent 87f812d6f3
commit 5436809323
13 changed files with 136 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
modules/lm-coursier/src/main/scala/lmcoursier/CoursierConfiguration.scala
View File

@ -32,7 +32,8 @@ final class CoursierConfiguration private (
val authenticationByRepositoryId: Vector[(String, Authentication)],
val credentials: Seq[Credentials],
val logger: Option[CacheLogger],
val cache: Option[File]
val cache: Option[File],
val ivyHome: Option[File]
) extends Serializable {
private def this() =
@ -56,6 +57,7 @@ final class CoursierConfiguration private (
Vector.empty,
Vector.empty,
None,
None,
None
)
@ -81,7 +83,8 @@ final class CoursierConfiguration private (
authenticationByRepositoryId == other.authenticationByRepositoryId &&
credentials == other.credentials &&
logger == other.logger &&
cache == other.cache
cache == other.cache &&
ivyHome == other.ivyHome
case _ => false
}
@ -107,11 +110,12 @@ final class CoursierConfiguration private (
code = 37 * (code + credentials.##)
code = 37 * (code + logger.##)
code = 37 * (code + cache.##)
code = 37 * (code + ivyHome.##)
code
}
override def toString: String =
s"CoursierConfiguration($log, $resolvers, $parallelDownloads, $maxIterations, $sbtScalaOrganization, $sbtScalaVersion, $sbtScalaJars, $interProjectDependencies, $excludeDependencies, $fallbackDependencies, $autoScalaLibrary, $hasClassifiers, $classifiers, $mavenProfiles, $scalaOrganization, $scalaVersion, $authenticationByRepositoryId, $credentials, $logger, $cache)"
s"CoursierConfiguration($log, $resolvers, $parallelDownloads, $maxIterations, $sbtScalaOrganization, $sbtScalaVersion, $sbtScalaJars, $interProjectDependencies, $excludeDependencies, $fallbackDependencies, $autoScalaLibrary, $hasClassifiers, $classifiers, $mavenProfiles, $scalaOrganization, $scalaVersion, $authenticationByRepositoryId, $credentials, $logger, $cache, $ivyHome)"
private[this] def copy(
log: Option[Logger] = log,
@ -133,7 +137,8 @@ final class CoursierConfiguration private (
authenticationByRepositoryId: Vector[(String, Authentication)] = authenticationByRepositoryId,
credentials: Seq[Credentials] = credentials,
logger: Option[CacheLogger] = logger,
cache: Option[File] = cache
cache: Option[File] = cache,
ivyHome: Option[File] = ivyHome
): CoursierConfiguration =
new CoursierConfiguration(
log,
@ -155,7 +160,8 @@ final class CoursierConfiguration private (
authenticationByRepositoryId,
credentials,
logger,
cache
cache,
ivyHome
)
def withLog(log: Option[Logger]): CoursierConfiguration =
@ -238,6 +244,11 @@ final class CoursierConfiguration private (
def withCache(cache: File): CoursierConfiguration =
copy(cache = Option(cache))
def withIvyHome(ivyHomeOpt: Option[File]): CoursierConfiguration =
copy(ivyHome = ivyHomeOpt)
def withIvyHome(ivyHome: File): CoursierConfiguration =
copy(ivyHome = Option(ivyHome))
}
object CoursierConfiguration {
@ -287,7 +298,8 @@ object CoursierConfiguration {
authenticationByRepositoryId,
credentials,
logger,
cache
cache,
None
)
def apply(
@ -332,6 +344,54 @@ object CoursierConfiguration {
authenticationByRepositoryId,
credentials,
Option(logger),
Option(cache)
Option(cache),
None
)
def apply(
log: Option[Logger],
resolvers: Vector[Resolver],
parallelDownloads: Int,
maxIterations: Int,
sbtScalaOrganization: Option[String],
sbtScalaVersion: Option[String],
sbtScalaJars: Vector[File],
interProjectDependencies: Vector[Project],
excludeDependencies: Vector[(String, String)],
fallbackDependencies: Vector[FallbackDependency],
autoScalaLibrary: Boolean,
hasClassifiers: Boolean,
classifiers: Vector[String],
mavenProfiles: Vector[String],
scalaOrganization: Option[String],
scalaVersion: Option[String],
authenticationByRepositoryId: Vector[(String, Authentication)],
credentials: Seq[Credentials],
logger: Option[CacheLogger],
cache: Option[File],
ivyHome: Option[File]
): CoursierConfiguration =
new CoursierConfiguration(
log,
resolvers,
parallelDownloads,
maxIterations,
sbtScalaOrganization,
sbtScalaVersion,
sbtScalaJars,
interProjectDependencies,
excludeDependencies,
fallbackDependencies,
autoScalaLibrary,
hasClassifiers,
classifiers,
mavenProfiles,
scalaOrganization,
scalaVersion,
authenticationByRepositoryId,
credentials,
logger,
cache,
ivyHome
)
}

2
modules/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala
View File

@ -74,7 +74,7 @@ class CoursierDependencyResolution(conf: CoursierConfiguration) extends Dependen
val checksums = CacheDefaults.checksums
val projectName = "" // used for logging only…
val ivyProperties = ResolutionParams.defaultIvyProperties()
val ivyProperties = ResolutionParams.defaultIvyProperties(conf.ivyHome)
val classifiers =
if (conf.hasClassifiers)

10
modules/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionParams.scala
View File

@ -84,12 +84,12 @@ object ResolutionParams {
private def cacheKey(cache: FileCache[Task]): Object =
m.invoke(cache)
def defaultIvyProperties(): Map[String, String] = {
def defaultIvyProperties(ivyHomeOpt: Option[File]): Map[String, String] = {
val ivyHome = sys.props.getOrElse(
"ivy.home",
new File(sys.props("user.home")).toURI.getPath + ".ivy2"
)
val ivyHome = sys.props
.get("ivy.home")
.orElse(ivyHomeOpt.map(_.getAbsoluteFile.toURI.getPath))
.getOrElse(new File(sys.props("user.home")).toURI.getPath + ".ivy2")
val sbtIvyHome = sys.props.getOrElse(
"sbt.ivy.home",

2
modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala
View File

@ -86,7 +86,7 @@ object ResolutionTasks {
val interProjectRepo = InterProjectRepository(interProjectDependencies)
val ivyProperties = ResolutionParams.defaultIvyProperties()
val ivyProperties = ResolutionParams.defaultIvyProperties(ivyPaths.value.ivyHome)
val authenticationByRepositoryId = coursierCredentials.value.mapValues(_.authentication)

4
modules/sbt-coursier/src/sbt-test/sbt-coursier/s3/build.sbt
View File

@ -25,7 +25,9 @@ check := {
sbtResolvers.flatMap{ sbtResolver: sbt.librarymanagement.Resolver =>
lmcoursier.internal.Resolvers.repository(
resolver = sbtResolver,
ivyProperties = lmcoursier.internal.ResolutionParams.defaultIvyProperties(),
ivyProperties = lmcoursier.internal.ResolutionParams.defaultIvyProperties(
ivyPaths.value.ivyHome
),
log = s.log,
authentication = None,
)

1
modules/sbt-coursier/src/sbt-test/shared-1/cache-local/README.md Normal file
View File

@ -0,0 +1 @@
Imported from https://github.com/sbt/sbt/tree/f5edeec2fdabd4313d2976b389bb6101775a5554/sbt/src/sbt-test/dependency-management/cache-local

1
modules/sbt-coursier/src/sbt-test/shared-1/cache-local/cache.sbt Normal file
View File

@ -0,0 +1 @@
ivyPaths := { IvyPaths(baseDirectory.value, Some(target.value / ".ivy2")) }

7
modules/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/def.sbt Normal file
View File

@ -0,0 +1,7 @@
organization := "org.example"
name := "def"
version := "1.0"
autoScalaLibrary := false

5
modules/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/resolver.sbt Normal file
View File

@ -0,0 +1,5 @@
publishTo := baseDirectory(base => Some(Resolver.file("filesys-publish", base / "repo")) ).value
resolvers += baseDirectory(base => "filesys" at (base / "repo").toURI.toString).value

9
modules/sbt-coursier/src/sbt-test/shared-1/cache-local/changes/use.sbt Normal file
View File

@ -0,0 +1,9 @@
organization := "org.example"
name := "use"
version := "1.0"
autoScalaLibrary := false
libraryDependencies += "org.example" %% "def" % "1.0"

13
modules/sbt-coursier/src/sbt-test/shared-1/cache-local/project/plugins.sbt Normal file
View File

@ -0,0 +1,13 @@
addSbtPlugin {
val name = sys.props.getOrElse(
"plugin.name",
sys.error("plugin.name Java property not set")
)
val version = sys.props.getOrElse(
"plugin.version",
sys.error("plugin.version Java property not set")
)
"io.get-coursier" % name % version
}

21
modules/sbt-coursier/src/sbt-test/shared-1/cache-local/test Normal file
View File

@ -0,0 +1,21 @@
$ copy-file changes/def.sbt build.sbt
$ copy-file changes/resolver.sbt resolver.sbt
> reload
> publishLocal
> publish
$ delete build.sbt
$ delete resolver.sbt
$ copy-file changes/use.sbt build.sbt
> reload
> update
> update
# needed for sbt-coursier (clear in-memory cache)
> clean
$ delete target/.ivy2/local
-> update
$ copy-file changes/resolver.sbt resolver.sbt
> reload
> update

3
modules/sbt-lm-coursier/src/main/scala/coursier/sbtlmcoursier/LmCoursierPlugin.scala
View File

@ -7,7 +7,7 @@ import coursier.sbtcoursiershared.{InputsTasks, SbtCoursierShared}
import sbt.{AutoPlugin, Classpaths, Def, Setting, Task, taskKey}
import sbt.Project.inTask
import sbt.KeyRanks.DTask
import sbt.Keys.{appConfiguration, autoScalaLibrary, classpathTypes, dependencyResolution, scalaBinaryVersion, scalaModuleInfo, scalaOrganization, scalaVersion, streams, updateClassifiers, updateSbtClassifiers}
import sbt.Keys.{appConfiguration, autoScalaLibrary, classpathTypes, dependencyResolution, ivyPaths, scalaBinaryVersion, scalaModuleInfo, scalaOrganization, scalaVersion, streams, updateClassifiers, updateSbtClassifiers}
import sbt.librarymanagement.DependencyResolution
import scala.language.reflectiveCalls
@ -133,6 +133,7 @@ object LmCoursierPlugin extends AutoPlugin {
.withLogger(createLogger)
.withCache(cache)
.withLog(s.log)
.withIvyHome(ivyPaths.value.ivyHome)
}
}
private def mkDependencyResolution: Def.Initialize[Task[DependencyResolution]] =