From ee608391970dc28cfe1f09747c81d33eb0badfa1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 25 Dec 2024 22:10:47 +0000 Subject: [PATCH 01/12] Update sbt, scripted-plugin to 1.10.7 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e88a0d8..73df629 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.6 +sbt.version=1.10.7 From 532816909af9a8f9e1ac6f8f218d0a09dcbdd00d Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:33:19 +0100 Subject: [PATCH 02/12] Update sbt-ci-release to 1.9.2 (#204) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 772616f..a5ea741 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") From eec633d4dadfcb33b6b64d7f0dfad16a69f32dc2 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 16 Jan 2025 11:41:51 -0800 Subject: [PATCH 03/12] add CLA checker (#208) --- .github/workflows/cla.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/cla.yml diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml new file mode 100644 index 0000000..3549ded --- /dev/null +++ b/.github/workflows/cla.yml @@ -0,0 +1,11 @@ +name: "Check Scala CLA" +on: + pull_request: +jobs: + cla-check: + runs-on: ubuntu-latest + steps: + - name: Verify CLA + uses: scala/cla-checker@v1 + with: + author: ${{ github.event.pull_request.user.login }} From 071ce300d61915149e195ce25137b48beb475e65 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 16 Jan 2025 13:41:40 -0800 Subject: [PATCH 04/12] copyright 2025 --- NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index 5f748c1..3f85eff 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,6 @@ sbt-scala-module -Copyright (c) 2013-2024 EPFL -Copyright (c) 2013-2024 Lightbend, Inc. dba Akka +Copyright (c) 2013-2025 EPFL +Copyright (c) 2013-2025 Lightbend, Inc. dba Akka Licensed under the Apache License, Version 2.0 (the "License"). Unless required by applicable law or agreed to in writing, software From b48f7b64531fc67f72bff69de1cecebc5e1b31a5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 5 Mar 2025 22:41:06 +0000 Subject: [PATCH 05/12] Update sbt, scripted-plugin to 1.10.10 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 73df629..e97b272 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.10.10 From cddcf7e1bd8b5526d72a1115fe754e4456f2f241 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 12 Mar 2025 15:22:56 -0700 Subject: [PATCH 06/12] sbt-ci-release 1.9.3 (was .2) (#211) --- build.sbt | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index fd29033..b009ca7 100644 --- a/build.sbt +++ b/build.sbt @@ -9,5 +9,5 @@ developers := List(Developer("", "", "", url("https://scala-lang.org")) addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.10.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") // set version, scmInfo, publishing settings +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3") // set version, scmInfo, publishing settings addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1") // brings in MiMa diff --git a/project/plugins.sbt b/project/plugins.sbt index a5ea741..e778d1e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3") From 7e54815d5ec8304ce2aeae38d804b7bf811f6243 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 18 Mar 2025 00:08:15 +0000 Subject: [PATCH 07/12] Update sbt, scripted-plugin to 1.10.11 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e97b272..cc68b53 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.10 +sbt.version=1.10.11 From 1aca1146a0ded56bf9ac4f938abc8a72599bd2c6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 24 May 2025 20:37:54 +0000 Subject: [PATCH 08/12] Update sbt, scripted-plugin to 1.11.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index cc68b53..6520f69 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.11 +sbt.version=1.11.0 From 333b40a3e7910234e2296beb87a4649e447a1554 Mon Sep 17 00:00:00 2001 From: philippus Date: Sun, 25 May 2025 10:14:54 +0200 Subject: [PATCH 09/12] Import from renamed sbt-osgi package --- src/main/scala/ScalaModulePlugin.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/ScalaModulePlugin.scala b/src/main/scala/ScalaModulePlugin.scala index b5c21c1..69cfbf4 100644 --- a/src/main/scala/ScalaModulePlugin.scala +++ b/src/main/scala/ScalaModulePlugin.scala @@ -1,6 +1,6 @@ package com.lightbend.tools.scalamoduleplugin -import com.typesafe.sbt.osgi.{OsgiKeys, SbtOsgi} +import com.github.sbt.osgi.{OsgiKeys, SbtOsgi} import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.{HeaderLicense, headerLicense} import sbt.Keys._ import sbt.{Def, _} From cbc3d2b8f509f6d5e4ad2772de49ac5f55312ebc Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 3 Jun 2025 22:08:03 +0000 Subject: [PATCH 10/12] Update sbt, scripted-plugin to 1.11.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 6520f69..61c9b1c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.0 +sbt.version=1.11.1 From d20bd3988ca0fae5e2205df2ca4e52b490f0b47d Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Wed, 4 Jun 2025 09:24:18 +0200 Subject: [PATCH 11/12] Update sbt-ci-release to 1.11.1 Remove `sonatypeProfileName`, per sbt-ci-release#375 --- build.sbt | 13 ++++++------- project/plugins.sbt | 2 +- src/main/scala/ScalaModulePlugin.scala | 6 +----- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index b009ca7..3741f19 100644 --- a/build.sbt +++ b/build.sbt @@ -1,13 +1,12 @@ enablePlugins(SbtPlugin) -name := "sbt-scala-module" -sonatypeProfileName := "org.scala-lang" -organization := "org.scala-lang.modules" -homepage := Some(url("https://github.com/scala/sbt-scala-module")) -licenses := Seq(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))) -developers := List(Developer("", "", "", url("https://scala-lang.org"))) +name := "sbt-scala-module" +organization := "org.scala-lang.modules" +homepage := Some(url("https://github.com/scala/sbt-scala-module")) +licenses := Seq(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))) +developers := List(Developer("", "", "", url("https://scala-lang.org"))) addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.10.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3") // set version, scmInfo, publishing settings +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1") // set version, scmInfo, publishing settings addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1") // brings in MiMa diff --git a/project/plugins.sbt b/project/plugins.sbt index e778d1e..d58ed13 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1") diff --git a/src/main/scala/ScalaModulePlugin.scala b/src/main/scala/ScalaModulePlugin.scala index 69cfbf4..4b46ef8 100644 --- a/src/main/scala/ScalaModulePlugin.scala +++ b/src/main/scala/ScalaModulePlugin.scala @@ -6,7 +6,6 @@ import sbt.Keys._ import sbt.{Def, _} import sbtdynver.DynVerPlugin import sbtdynver.DynVerPlugin.autoImport.dynverGitDescribeOutput -import xerial.sbt.Sonatype.autoImport.{sonatypeProfileName, sonatypeSessionName} import sbtversionpolicy.SbtVersionPolicyPlugin.autoImport.{Compatibility, versionPolicyCheck, versionPolicyIgnoredInternalDependencyVersions, versionPolicyIntention} object ScalaModulePlugin extends AutoPlugin { @@ -34,10 +33,7 @@ object ScalaModulePlugin extends AutoPlugin { ) // Settings added to the project scope - override def projectSettings: Seq[Setting[_]] = Seq( - // The staging profile is called `org.scala-lang`, the default is `org.scala-lang.modules` - sonatypeProfileName := "org.scala-lang", - ) + override def projectSettings: Seq[Setting[_]] = Seq() // Global settings override def globalSettings: Seq[Def.Setting[_]] = Seq( From 8bb46546d7929c1a930765689b8be0cb3b5200ee Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Wed, 4 Jun 2025 10:03:49 +0200 Subject: [PATCH 12/12] Bring maven metadata in line with scala/scala --- src/main/scala/ScalaModulePlugin.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/ScalaModulePlugin.scala b/src/main/scala/ScalaModulePlugin.scala index 4b46ef8..eb9e4b1 100644 --- a/src/main/scala/ScalaModulePlugin.scala +++ b/src/main/scala/ScalaModulePlugin.scala @@ -141,7 +141,7 @@ object ScalaModulePlugin extends AutoPlugin { Akka - Akka + Lightbend, Inc. dba Akka )