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

Merge branch 'develop' into fix/8741-dependency-lock-file-url

This commit is contained in:
bitloi 2026-02-15 06:10:12 -05:00 committed by GitHub
parent b53342da15 eaa1c0845d
commit d7cb2c07a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/src/main/scala/sbt/Defaults.scala
View File

@ -4373,6 +4373,7 @@ object Classpaths {
val sbtMavenSnapshots: MavenRepository =
MavenRepository("sbt-maven-snapshot", Resolver.SbtRepositoryRoot + "/" + "maven-snapshots/")
@deprecated("no longer true for sbt 2.x", "2.0.0")
def modifyForPlugin(plugin: Boolean, dep: ModuleID): ModuleID =
if (plugin) dep.withConfigurations(Some(Provided.name)) else dep
@ -4382,11 +4383,10 @@ object Classpaths {
org: String,
version: String
): Seq[ModuleID] =
if (auto)
modifyForPlugin(plugin, ScalaArtifacts.libraryDependency(org, version))
.platform(Platform.jvm) :: Nil
else
Nil
if auto then
if ScalaArtifacts.isScala3(version) then ScalaArtifacts.libraryDependency(org, version) :: Nil
else (modifyForPlugin(plugin, ScalaArtifacts.libraryDependency(org, version)): @nowarn) :: Nil
else Nil
def addUnmanagedLibrary: Seq[Setting[?]] =
Seq((Compile / unmanagedJars) ++= unmanagedScalaLibrary.value)

1
sbt-app/src/sbt-test/plugins/pgp/build.sbt
View File

@ -1 +1,2 @@
scalaVersion := "3.8.1"
publishLocal := {}

3
sbt-app/src/sbt-test/plugins/pgp/project/plugins.sbt
View File

@ -1,2 +1 @@
// addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
libraryDependencies += Defaults.sbtPluginExtra("com.github.sbt" % "sbt-pgp" % "2.3.1", "2", "3.8.1")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")