From 5c2b95980b71b9f362045428a221a6b69b18d2d6 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Tue, 26 Mar 2024 16:14:12 +0100 Subject: [PATCH] Fix exclude-dependencies and exclude-dependencies2 --- sbt-app/src/main/scala/sbt/Import.scala | 4 ++++ .../exclude-dependencies/{pending => test} | 0 .../exclude-dependencies2/{pending => test} | 0 3 files changed, 4 insertions(+) rename sbt-app/src/sbt-test/dependency-management/exclude-dependencies/{pending => test} (100%) rename sbt-app/src/sbt-test/dependency-management/exclude-dependencies2/{pending => test} (100%) diff --git a/sbt-app/src/main/scala/sbt/Import.scala b/sbt-app/src/main/scala/sbt/Import.scala index 48ce25a28..563819660 100644 --- a/sbt-app/src/main/scala/sbt/Import.scala +++ b/sbt-app/src/main/scala/sbt/Import.scala @@ -295,6 +295,10 @@ trait Import { type IvyScala = sbt.librarymanagement.ScalaModuleInfo val JCenterRepository = sbt.librarymanagement.Resolver.JCenterRepository val JavaNet2Repository = sbt.librarymanagement.Resolver.JavaNet2Repository + import sbt.librarymanagement.{ InclExclRule, DependencyBuilders } + given Conversion[String, InclExclRule] = InclExclRule.stringToExclusionRule + given Conversion[DependencyBuilders.OrganizationArtifactName, InclExclRule] = + InclExclRule.organizationArtifactNameToExclusionRule // todo: fix // val License = sbt.librarymanagement.License diff --git a/sbt-app/src/sbt-test/dependency-management/exclude-dependencies/pending b/sbt-app/src/sbt-test/dependency-management/exclude-dependencies/test similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/exclude-dependencies/pending rename to sbt-app/src/sbt-test/dependency-management/exclude-dependencies/test diff --git a/sbt-app/src/sbt-test/dependency-management/exclude-dependencies2/pending b/sbt-app/src/sbt-test/dependency-management/exclude-dependencies2/test similarity index 100% rename from sbt-app/src/sbt-test/dependency-management/exclude-dependencies2/pending rename to sbt-app/src/sbt-test/dependency-management/exclude-dependencies2/test