Change groupId to org.playframework.twirl

playframework · Sep 12, 2023 · 1157953 · 1157953
1 parent cccdd63
commit 1157953
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 [![OpenCollective](https://img.shields.io/opencollective/all/playframework?label=financial%20contributors&logo=open-collective)](https://opencollective.com/playframework)
 
 [![Build Status](https://github.com/playframework/twirl/actions/workflows/build-test.yml/badge.svg)](https://github.com/playframework/twirl/actions/workflows/build-test.yml)
-[![Maven](https://img.shields.io/maven-central/v/com.typesafe.play/twirl-api_2.13.svg?logo=apache-maven)](https://mvnrepository.com/artifact/com.typesafe.play/twirl-api_2.13)
+[![Maven](https://img.shields.io/maven-central/v/org.playframework.twirl/twirl-api_2.13.svg?logo=apache-maven)](https://mvnrepository.com/artifact/org.playframework.twirl/twirl-api_2.13)
 [![Repository size](https://img.shields.io/github/repo-size/playframework/twirl.svg?logo=git)](https://github.com/playframework/twirl)
 [![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
 [![Mergify Status](https://img.shields.io/endpoint.svg?url=https://api.mergify.com/v1/badges/playframework/twirl&style=flat)](https://mergify.com)
@@ -35,8 +35,8 @@ To add the sbt plugin to your project add the sbt plugin dependency in
 `project/plugins.sbt`:
 
 ```scala
-// twirl 1.6 and newer:
-addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "LATEST_VERSION")
+// twirl 1.6:
+addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "LATEST_VERSION")
 // twirl 1.5 and before:
 addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
 ```

diff --git a/build.sbt b/build.sbt
@@ -27,7 +27,8 @@ val mimaSettings = Seq(
     CrossVersion.partialVersion(scalaVersion.value) match {
       // No release for Scala 3 yet
       case Some((3, _)) => Set.empty
-      case _            => previousVersion.map(organization.value %% name.value % _).toSet
+      // TODO: change back to `organization.value` after first release with new groupId
+      case _ => previousVersion.map("com.typesafe.play" %% name.value % _).toSet
     }
   },
   mimaBinaryIssueFilters ++= Seq(
@@ -139,7 +140,7 @@ lazy val plugin = project
   .dependsOn(compiler)
   .settings(
     name                                    := "sbt-twirl",
-    organization                            := "com.typesafe.play",
+    organization                            := "org.playframework.twirl",
     scalaVersion                            := Scala212,
     libraryDependencies += "org.scalatest" %%% "scalatest" % ScalaTestVersion % Test,
     Compile / resourceGenerators += generateVersionFile.taskValue,

diff --git a/project/Common.scala b/project/Common.scala
@@ -58,7 +58,7 @@ object Common extends AutoPlugin {
 
   override def globalSettings =
     Seq(
-      organization         := "com.typesafe.play",
+      organization         := "org.playframework.twirl",
       organizationName     := "The Play Framework Project",
       organizationHomepage := Some(url("https://playframework.com/")),
       homepage             := Some(url(s"https://github.com/playframework/${repoName}")),

diff --git a/sbt-twirl/src/main/scala/play/twirl/sbt/SbtTwirl.scala b/sbt-twirl/src/main/scala/play/twirl/sbt/SbtTwirl.scala
@@ -88,7 +88,10 @@ object SbtTwirl extends AutoPlugin {
           case None    => false
         }
         // TODO: can we use %%% from sbt-crossproject now that we're on Scala.js 1.x?
-        val baseModuleID = "com.typesafe.play" %% "twirl-api" % twirlVersion.value
+        val groupId =
+          if (VersionNumber(twirlVersion.value).matchesSemVer(SemanticSelector("<=1.6.0-RC2"))) "com.typesafe.play"
+          else "org.playframework.twirl"
+        val baseModuleID = groupId %% "twirl-api" % twirlVersion.value
         if (isScalaJS) baseModuleID.cross(crossVer) else baseModuleID
       }
     )

diff --git a/sbt-twirl/src/sbt-test/twirl/compile-scala3/project/plugins.sbt b/sbt-twirl/src/sbt-test/twirl/compile-scala3/project/plugins.sbt
@@ -1,3 +1,3 @@
 // Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
-addSbtPlugin("com.typesafe.play" % "sbt-twirl" % sys.props("project.version"))
+addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % sys.props("project.version"))
diff --git a/sbt-twirl/src/sbt-test/twirl/compile/project/plugins.sbt b/sbt-twirl/src/sbt-test/twirl/compile/project/plugins.sbt
@@ -1,3 +1,3 @@
 // Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
-addSbtPlugin("com.typesafe.play" % "sbt-twirl" % sys.props("project.version"))
+addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % sys.props("project.version"))
diff --git a/sbt-twirl/src/sbt-test/twirl/scalajs-compile/project/plugins.sbt b/sbt-twirl/src/sbt-test/twirl/scalajs-compile/project/plugins.sbt
@@ -1,4 +1,4 @@
 // Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
-addSbtPlugin("com.typesafe.play" % "sbt-twirl"   % sys.props("project.version"))
-addSbtPlugin("org.scala-js"      % "sbt-scalajs" % "1.13.2")
+addSbtPlugin("org.playframework.twirl" % "sbt-twirl"   % sys.props("project.version"))
+addSbtPlugin("org.scala-js"            % "sbt-scalajs" % "1.13.2")