From f14692f0b14b4df72fdf47aa624eb08e3654ada2 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 2 Oct 2015 00:25:45 -0400 Subject: [PATCH] changes due to bumping up librarymangement to 0.1.0-M4 --- main/actions/src/main/scala/sbt/CacheIvy.scala | 12 ++++-------- project/Dependencies.scala | 2 +- sbt/src/main/scala/Import.scala | 6 ------ .../dependency-management/java.net/build.sbt | 5 ----- sbt/src/sbt-test/dependency-management/java.net/test | 1 - 5 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 sbt/src/sbt-test/dependency-management/java.net/build.sbt delete mode 100644 sbt/src/sbt-test/dependency-management/java.net/test diff --git a/main/actions/src/main/scala/sbt/CacheIvy.scala b/main/actions/src/main/scala/sbt/CacheIvy.scala index 353dcbcbd..d9f27a334 100644 --- a/main/actions/src/main/scala/sbt/CacheIvy.scala +++ b/main/actions/src/main/scala/sbt/CacheIvy.scala @@ -72,8 +72,8 @@ object CacheIvy { } implicit def updateStatsFormat: Format[UpdateStats] = wrap[UpdateStats, (Long, Long, Long)](us => (us.resolveTime, us.downloadTime, us.downloadSize), { case (rt, dt, ds) => new UpdateStats(rt, dt, ds, true) }) - implicit def confReportFormat(implicit m: Format[String], mr: Format[Seq[ModuleReport]], oar: Format[Seq[OrganizationArtifactReport]], mi: Format[Seq[ModuleID]]): Format[ConfigurationReport] = - wrap[ConfigurationReport, (String, Seq[ModuleReport], Seq[OrganizationArtifactReport], Seq[ModuleID])](r => (r.configuration, r.modules, r.details, r.evicted), { case (c, m, d, v) => new ConfigurationReport(c, m, d, v) }) + implicit def confReportFormat(implicit m: Format[String], mr: Format[Seq[ModuleReport]], oar: Format[Seq[OrganizationArtifactReport]]): Format[ConfigurationReport] = + wrap[ConfigurationReport, (String, Seq[ModuleReport], Seq[OrganizationArtifactReport])](r => (r.configuration, r.modules, r.details), { case (c, m, d) => new ConfigurationReport(c, m, d) }) implicit def moduleReportFormat(implicit cf: Format[Seq[Caller]], ff: Format[File]): Format[ModuleReport] = { wrap[ModuleReport, (ModuleID, Seq[(Artifact, File)], Seq[Artifact], Option[String], Option[Long], Option[String], Option[String], Boolean, Option[String], Option[String], Option[String], Option[String], Map[String, String], Option[Boolean], Option[String], Seq[String], Seq[(String, Option[String])], Seq[Caller])]( m => (m.module, m.artifacts, m.missingArtifacts, m.status, m.publicationDate map { _.getTime }, m.resolver, m.artifactResolver, m.evicted, m.evictedData, m.evictedReason, m.problem, m.homepage, m.extraAttributes, m.isDefault, m.branch, m.configurations, m.licenses, m.callers), @@ -142,7 +142,7 @@ object CacheIvy { implicit def inlineIvyIC: InputCache[InlineIvyConfiguration] = wrapIn implicit def moduleSettingsIC: InputCache[ModuleSettings] = - unionInputCache[ModuleSettings, PomConfiguration :+: InlineConfiguration :+: InlineConfigurationWithExcludes :+: EmptyConfiguration :+: IvyFileConfiguration :+: HNil] + unionInputCache[ModuleSettings, PomConfiguration :+: InlineConfiguration :+: InlineConfigurationWithExcludes :+: IvyFileConfiguration :+: HNil] implicit def ivyConfigurationIC: InputCache[IvyConfiguration] = unionInputCache[IvyConfiguration, InlineIvyConfiguration :+: ExternalIvyConfiguration :+: HNil] @@ -152,13 +152,11 @@ object CacheIvy { c.module :+: c.dependencies :+: c.ivyXML :+: c.configurations :+: c.defaultConfiguration.map(_.name) :+: c.ivyScala :+: c.validate :+: c.overrides :+: c.excludes :+: HNil implicit def moduleConfToHL = (m: ModuleConfiguration) => m.organization :+: m.name :+: m.revision :+: m.resolver :+: HNil - implicit def emptyToHL = (e: EmptyConfiguration) => e.module :+: e.ivyScala :+: e.validate :+: HNil implicit def inlineToHL = (c: InlineConfiguration) => c.module :+: c.dependencies :+: c.ivyXML :+: c.configurations :+: c.defaultConfiguration.map(_.name) :+: c.ivyScala :+: c.validate :+: c.overrides :+: HNil } import L4._ implicit def inlineWithExcludesIC: InputCache[InlineConfigurationWithExcludes] = wrapIn - implicit def emptyIC: InputCache[EmptyConfiguration] = wrapIn implicit def inlineIC: InputCache[InlineConfiguration] = wrapIn implicit def moduleConfIC: InputCache[ModuleConfiguration] = wrapIn @@ -177,7 +175,7 @@ object CacheIvy { implicit lazy val chainedIC: InputCache[ChainedResolver] = InputCache.lzy(wrapIn) implicit lazy val resolverIC: InputCache[Resolver] = - unionInputCache[Resolver, ChainedResolver :+: JavaNet1Repository :+: MavenRepository :+: MavenCache :+: FileRepository :+: URLRepository :+: SshRepository :+: SftpRepository :+: RawRepository :+: HNil] + unionInputCache[Resolver, ChainedResolver :+: MavenRepository :+: MavenCache :+: FileRepository :+: URLRepository :+: SshRepository :+: SftpRepository :+: RawRepository :+: HNil] implicit def moduleIC: InputCache[ModuleID] = wrapIn implicitly[InputCache[Seq[Configuration]]] @@ -235,6 +233,4 @@ object CacheIvy { implicit def authIC: InputCache[SshAuthentication] = unionInputCache[SshAuthentication, PasswordAuthentication :+: KeyFileAuthentication :+: HNil] - - implicit def javaNet1IC: InputCache[JavaNet1Repository] = singleton(JavaNet1Repository) } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6d43d0297..2805bd381 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,7 @@ object Dependencies { val utilVersion = "0.1.0-M5" val ioVersion = "1.0.0-M3" val incremenalcompilerVersion = "0.1.0-M1-168cb7a4877917e01917e35b9b82a62afe5c2a01" - val librarymanagementVersion = "0.1.0-M3" + val librarymanagementVersion = "0.1.0-M4" lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion lazy val utilLogging = "org.scala-sbt" %% "util-logging" % utilVersion diff --git a/sbt/src/main/scala/Import.scala b/sbt/src/main/scala/Import.scala index e3907e8dd..f3744a5a8 100644 --- a/sbt/src/main/scala/Import.scala +++ b/sbt/src/main/scala/Import.scala @@ -290,8 +290,6 @@ object Import { val IvyScala = sbt.librarymanagement.IvyScala type IvyScala = sbt.librarymanagement.IvyScala val JCenterRepository = sbt.librarymanagement.JCenterRepository - val JavaNet1Repository = sbt.librarymanagement.JavaNet1Repository - type JavaNet1Repository = sbt.librarymanagement.JavaNet1Repository val JavaNet2Repository = sbt.librarymanagement.JavaNet2Repository val MavenCache = sbt.librarymanagement.MavenCache type MavenCache = sbt.librarymanagement.MavenCache @@ -352,8 +350,6 @@ object Import { val DependencyFilter = sbt.internal.librarymanagement.DependencyFilter type DependencyFilter = sbt.internal.librarymanagement.DependencyFilter type DependencyFilterExtra = sbt.internal.librarymanagement.DependencyFilterExtra - val EmptyConfiguration = sbt.internal.librarymanagement.EmptyConfiguration - type EmptyConfiguration = sbt.internal.librarymanagement.EmptyConfiguration val ExternalIvyConfiguration = sbt.internal.librarymanagement.ExternalIvyConfiguration type ExternalIvyConfiguration = sbt.internal.librarymanagement.ExternalIvyConfiguration val GetClassifiersConfiguration = sbt.internal.librarymanagement.GetClassifiersConfiguration @@ -387,8 +383,6 @@ object Import { val MakePomConfiguration = sbt.internal.librarymanagement.MakePomConfiguration type MakePomConfiguration = sbt.internal.librarymanagement.MakePomConfiguration type ModuleFilter = sbt.internal.librarymanagement.ModuleFilter - val ModuleSettings = sbt.internal.librarymanagement.ModuleSettings - type ModuleSettings = sbt.internal.librarymanagement.ModuleSettings type NotInCache = sbt.internal.librarymanagement.NotInCache val PomConfiguration = sbt.internal.librarymanagement.PomConfiguration type PomConfiguration = sbt.internal.librarymanagement.PomConfiguration diff --git a/sbt/src/sbt-test/dependency-management/java.net/build.sbt b/sbt/src/sbt-test/dependency-management/java.net/build.sbt deleted file mode 100644 index 6c4da154b..000000000 --- a/sbt/src/sbt-test/dependency-management/java.net/build.sbt +++ /dev/null @@ -1,5 +0,0 @@ -ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy-home"))) - -resolvers += JavaNet1Repository - -libraryDependencies += "javax.ejb" % "ejb-api" % "3.0" diff --git a/sbt/src/sbt-test/dependency-management/java.net/test b/sbt/src/sbt-test/dependency-management/java.net/test deleted file mode 100644 index edf1fbdd5..000000000 --- a/sbt/src/sbt-test/dependency-management/java.net/test +++ /dev/null @@ -1 +0,0 @@ -> update \ No newline at end of file