Merge pull request #13322 from scala-steward/update/3.0.x/sbt-ci-release-1.11.1

mkurz · web-flow · commit 6c59b6765703 · 2025-06-30T21:51:13.000+02:00
[3.0.x] sbt-ci-release 1.11.1 (was 1.9.3)
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -23,7 +23,6 @@ import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
 import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.HeaderPattern.commentBetween
 import de.heikoseeberger.sbtheader.LineCommentCreator
 import nl.gn0s1s.pekko.versioncheck.PekkoVersionCheckPlugin.autoImport._
-import xerial.sbt.Sonatype.autoImport.sonatypeProfileName
 import Omnidoc.autoImport.omnidocPathPrefix
 import Omnidoc.autoImport.omnidocSnapshotBranch
 import PlayBuildBase.autoImport.PlayLibrary
@@ -93,7 +92,6 @@ object BuildSettings {
 
   /** These settings are used by all projects. */
   def playCommonSettings: Seq[Setting[_]] = Def.settings(
-    sonatypeProfileName := "org.playframework",
     fileHeaderSettings,
     ivyLoggingLevel := UpdateLogging.DownloadOnly,
     resolvers ++= Resolver.sonatypeOssRepos("releases"), // sync ScriptedTools.scala
diff --git a/project/PlayLibraryBase.scala b/project/PlayLibraryBase.scala
@@ -21,7 +21,7 @@ import Omnidoc.autoImport.omnidocTagPrefix
 object PlayLibraryBase extends AutoPlugin {
 
   override def trigger  = noTrigger
-  override def requires = PlayBuildBase && PlaySonatypeBase && Omnidoc
+  override def requires = PlayBuildBase && Omnidoc
 
   import PlayBuildBase.autoImport._
 
diff --git a/project/PlayRootProjectBase.scala b/project/PlayRootProjectBase.scala
@@ -11,6 +11,6 @@ import sbt._
  */
 object PlayRootProjectBase extends AutoPlugin {
   override def trigger         = noTrigger
-  override def requires        = PlayBuildBase && PlaySonatypeBase
+  override def requires        = PlayBuildBase
   override def projectSettings = PlayNoPublishBase.projectSettings
 }
diff --git a/project/PlaySbtLibraryBase.scala b/project/PlaySbtLibraryBase.scala
@@ -12,6 +12,6 @@ import sbt.AutoPlugin
 object PlaySbtLibraryBase extends AutoPlugin {
 
   override def trigger  = noTrigger
-  override def requires = PlayBuildBase && PlaySbtBuildBase && PlaySonatypeBase
+  override def requires = PlayBuildBase && PlaySbtBuildBase
 
 }
diff --git a/project/PlaySbtPluginBase.scala b/project/PlaySbtPluginBase.scala
@@ -16,7 +16,7 @@ import sbt.ScriptedPlugin.autoImport._
 object PlaySbtPluginBase extends AutoPlugin {
 
   override def trigger  = noTrigger
-  override def requires = PlaySonatypeBase && PlayBuildBase && PlaySbtBuildBase && SbtPlugin
+  override def requires = PlayBuildBase && PlaySbtBuildBase && SbtPlugin
 
   override def projectSettings = Seq(
     scriptedLaunchOpts += version.apply { v => s"-Dproject.version=$v" }.value
diff --git a/project/PlaySonatypeBase.scala b/project/PlaySonatypeBase.scala
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -31,7 +31,7 @@ addSbtPlugin("com.github.sbt"          % "sbt-java-formatter"    % sbtJavaFormat
 addSbtPlugin("pl.project13.scala"      % "sbt-jmh"               % sbtJmh)
 addSbtPlugin("de.heikoseeberger"       % "sbt-header"            % sbtHeader)
 addSbtPlugin("org.scalameta"           % "sbt-scalafmt"          % scalafmt)
-addSbtPlugin("com.github.sbt"          % "sbt-ci-release"        % "1.9.3")
+addSbtPlugin("com.github.sbt"          % "sbt-ci-release"        % "1.11.1")
 
 addSbtPlugin("nl.gn0s1s" % "sbt-pekko-version-check" % "0.0.7")
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ import sbt._`
`11`	`11`	`*/`
`12`	`12`	`object PlayRootProjectBase extends AutoPlugin {`
`13`	`13`	`override def trigger = noTrigger`
`14`		`- override def requires = PlayBuildBase && PlaySonatypeBase`
	`14`	`+ override def requires = PlayBuildBase`
`15`	`15`	`override def projectSettings = PlayNoPublishBase.projectSettings`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ import sbt.AutoPlugin`
`12`	`12`	`object PlaySbtLibraryBase extends AutoPlugin {`
`13`	`13`
`14`	`14`	`override def trigger = noTrigger`
`15`		`- override def requires = PlayBuildBase && PlaySbtBuildBase && PlaySonatypeBase`
	`15`	`+ override def requires = PlayBuildBase && PlaySbtBuildBase`
`16`	`16`
`17`	`17`	`}`