Merge pull request #298 from mkurz/org.playframework

Switch to org.playframework
playframework · Oct 27, 2023 · 374ce8f · 374ce8f
2 parents ec0979e + d7f994a
commit 374ce8f
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,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/play-mailer/actions/workflows/build-test.yml/badge.svg)](https://github.com/playframework/play-mailer/actions/workflows/build-test.yml)
-[![Maven](https://img.shields.io/maven-central/v/com.typesafe.play/play-mailer_2.13.svg?logo=apache-maven)](https://mvnrepository.com/artifact/com.typesafe.play/play-mailer_2.13)
+[![Maven](https://img.shields.io/maven-central/v/org.playframework/play-mailer_2.13.svg?logo=apache-maven)](https://mvnrepository.com/artifact/org.playframework/play-mailer_2.13)
 [![Repository size](https://img.shields.io/github/repo-size/playframework/play-mailer.svg?logo=git)](https://github.com/playframework/play-mailer)
 [![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/play-mailer&style=flat)](https://mergify.com)
@@ -21,8 +21,8 @@ Play Mailer is a powerful Scala Mailing library. It provides a simple configurab
 To get started you add `play-mailer` and `play-mailer-guice` as a dependency in SBT:
 
 ```scala
-libraryDependencies += "com.typesafe.play" %% "play-mailer" % -version-
-libraryDependencies += "com.typesafe.play" %% "play-mailer-guice" % -version-
+libraryDependencies += "org.playframework" %% "play-mailer" % -version-
+libraryDependencies += "org.playframework" %% "play-mailer-guice" % -version-
 ```
 
 ## Versioning
@@ -110,7 +110,7 @@ class MailerService @Inject() (mailerClient: MailerClient) {
 
 #### Compile Time Injection
 
-If you use Compile time Injection you can remove `libraryDependencies += "com.typesafe.play" %% "play-mailer-guice" % -version-` from your `build.sbt`.
+If you use Compile time Injection you can remove `libraryDependencies += "org.playframework" %% "play-mailer-guice" % -version-` from your `build.sbt`.
 
 Create the MailerService without the `@Inject` annotation:
 

diff --git a/build.sbt b/build.sbt
@@ -44,11 +44,11 @@ lazy val `play-mailer` = (project in file("play-mailer"))
       "com.typesafe" % "config" % "1.4.3",
       "org.slf4j" % "slf4j-api" % "2.0.9",
       "org.apache.commons" % "commons-email" % "1.5",
-      "com.typesafe.play" %% "play" % Dependencies.PlayVersion % Test,
-      "com.typesafe.play" %% "play-specs2" % Dependencies.PlayVersion % Test
+      "org.playframework" %% "play" % Dependencies.PlayVersion % Test,
+      "org.playframework" %% "play-specs2" % Dependencies.PlayVersion % Test
     ),
-    mimaPreviousArtifacts := Set("com.typesafe.play" %% "play-mailer" % previousStableVersion.value
-      .getOrElse(throw new Error("Unable to determine previous version"))),
+    mimaPreviousArtifacts := Set.empty //Set("org.playframework" %% "play-mailer" % previousStableVersion.value
+      //.getOrElse(throw new Error("Unable to determine previous version"))),
   )
 
 lazy val `play-mailer-guice` = (project in file("play-mailer-guice"))
@@ -58,11 +58,11 @@ lazy val `play-mailer-guice` = (project in file("play-mailer-guice"))
   .settings(
     libraryDependencies ++= Seq(
       "com.google.inject" % "guice" % "6.0.0",
-      "com.typesafe.play" %% "play" % Dependencies.PlayVersion % Test,
-      "com.typesafe.play" %% "play-specs2" % Dependencies.PlayVersion % Test
+      "org.playframework" %% "play" % Dependencies.PlayVersion % Test,
+      "org.playframework" %% "play-specs2" % Dependencies.PlayVersion % Test
     ),
-    mimaPreviousArtifacts := Set("com.typesafe.play" %% "play-mailer-guice" % previousStableVersion.value
-      .getOrElse(throw new Error("Unable to determine previous version")))
+    mimaPreviousArtifacts := Set.empty // Set("org.playframework" %% "play-mailer-guice" % previousStableVersion.value
+      //.getOrElse(throw new Error("Unable to determine previous version")))
     ,
   )
 

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

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,5 +6,5 @@ object Dependencies {
   val Scala3 = "3.3.1"
   val ScalaVersions = Seq(Scala213, Scala3)
 
-  val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.0-RC3"))
+  val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "3.0.0"))
 }
diff --git a/samples/compile-timeDI/build.sbt b/samples/compile-timeDI/build.sbt
@@ -12,8 +12,8 @@ scalaVersion := "2.13.12"
 crossScalaVersions := Seq("2.13.12", "3.3.1")
 
 libraryDependencies ++= Seq(
-  "com.typesafe.play" %% "play-mailer" % version.value,
-  "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.0-RC2" % Test
+  "org.playframework" %% "play-mailer" % version.value,
+  "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.0" % Test
 )
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)

diff --git a/samples/compile-timeDI/project/plugins.sbt b/samples/compile-timeDI/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.0-RC3"))
+addSbtPlugin("org.playframework" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "3.0.0"))
 addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
diff --git a/samples/runtimeDI/build.sbt b/samples/runtimeDI/build.sbt
@@ -12,8 +12,8 @@ scalaVersion := "2.13.12"
 crossScalaVersions := Seq("2.13.12", "3.3.1")
 
 libraryDependencies ++= Seq(
-  "com.typesafe.play" %% "play-mailer-guice" % version.value,
-  "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.0-RC2" % Test
+  "org.playframework" %% "play-mailer-guice" % version.value,
+  "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.0" % Test
 )
 
 lazy val root = (project in file(".")).enablePlugins(PlayJava)

diff --git a/samples/runtimeDI/project/plugins.sbt b/samples/runtimeDI/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.0-RC3"))
+addSbtPlugin("org.playframework" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "3.0.0"))
 addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")