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

main/src/main/scala/sbt/Defaults.scala

@@ -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)
+    if auto then
-      modifyForPlugin(plugin, ScalaArtifacts.libraryDependency(org, version))
+      if ScalaArtifacts.isScala3(version) then ScalaArtifacts.libraryDependency(org, version) :: Nil
-        .platform(Platform.jvm) :: Nil
+      else (modifyForPlugin(plugin, ScalaArtifacts.libraryDependency(org, version)): @nowarn) :: Nil
-    else
+    else Nil
-      Nil
 
   def addUnmanagedLibrary: Seq[Setting[?]] =
     Seq((Compile / unmanagedJars) ++= unmanagedScalaLibrary.value)

sbt-app/src/sbt-test/plugins/pgp/build.sbt

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

sbt-app/src/sbt-test/plugins/pgp/project/plugins.sbt

@@ -1,2 +1 @@
-// addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.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")