Merge pull request #1425 from yadavan88/unified-version-defn

lor6 · web-flow · commit 063f5a21ea9b · 2024-07-01T09:21:57.000+03:00
Moved common versions to a single version file
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ project/plugins/project/
 .worksheet
 .idea
 !/project/Versions.scala
+!/project/LibraryVersions.scala
 /project/
 !project/build.properties
 out
diff --git a/build.sbt b/build.sbt
@@ -413,7 +413,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
       "com.github.seratch" %% "awscala" % "0.9.2"
     ),
     libraryDependencies ++= Seq(
-      "org.playframework" %% "play-slick" % "6.1.1",
+      "org.playframework" %% "play-slick" % LibraryVersions.playSlickVersion,
       "org.postgresql" % "postgresql" % "42.7.3"
     ),
     dependencyOverrides := Seq(
diff --git a/play-scala/application-tests/build.sbt b/play-scala/application-tests/build.sbt
@@ -10,7 +10,7 @@ scalaVersion := ScalaVersions.scala3Version
 libraryDependencies += guice
 libraryDependencies += "com.h2database" % "h2" % "1.4.200"
 libraryDependencies += "org.postgresql" % "postgresql" % "42.2.29"
-libraryDependencies += "org.playframework" %% "play-slick" % "6.1.1"
-libraryDependencies += "org.playframework" %% "play-slick-evolutions" % "6.1.1"
-libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
+libraryDependencies += "org.playframework" %% "play-slick" % LibraryVersions.playSlickVersion
+libraryDependencies += "org.playframework" %% "play-slick-evolutions" % LibraryVersions.playSlickVersion
+libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % LibraryVersions.scalatestPlayVersion % Test
 libraryDependencies += "org.scalatestplus" %% "mockito-3-4" % "3.2.10.0" % Test
diff --git a/play-scala/application-tests/project/plugins.sbt b/play-scala/application-tests/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")
+addSbtPlugin("org.playframework" % "sbt-plugin" % LibraryVersions.playVersion)
 addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.16.2")
diff --git a/play-scala/async-tasks/project/plugins.sbt b/play-scala/async-tasks/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")
+addSbtPlugin("org.playframework" % "sbt-plugin" % LibraryVersions.playVersion)
 addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.11.0")
diff --git a/play-scala/caching-in-play/build.sbt b/play-scala/caching-in-play/build.sbt
@@ -10,7 +10,7 @@ scalaVersion := ScalaVersions.scala3Version
 libraryDependencies += guice
 libraryDependencies += caffeine
 libraryDependencies += ws
-libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
+libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % LibraryVersions.scalatestPlayVersion % Test
 libraryDependencies += "org.mockito" % "mockito-core" % "5.12.0" % Test
 
 PlayKeys.devSettings += "play.server.http.port" -> "9000"
diff --git a/play-scala/caching-in-play/project/plugins.sbt b/play-scala/caching-in-play/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")
+addSbtPlugin("org.playframework" % "sbt-plugin" % LibraryVersions.playVersion)
 addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.11.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
diff --git a/play-scala/configuration-access/build.sbt b/play-scala/configuration-access/build.sbt
@@ -8,7 +8,7 @@ enablePlugins(PlayScala)
 scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
-libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
+libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % LibraryVersions.scalatestPlayVersion % Test
 libraryDependencies += "org.scalatestplus" %% "mockito-3-4" % "3.2.10.0"
 
 // Adds additional packages into Twirl
diff --git a/play-scala/configuration-access/project/plugins.sbt b/play-scala/configuration-access/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")
+addSbtPlugin("org.playframework" % "sbt-plugin" % LibraryVersions.playVersion)
 addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.11.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
diff --git a/play-scala/custom-error-handling/build.sbt b/play-scala/custom-error-handling/build.sbt
@@ -8,4 +8,4 @@ enablePlugins(PlayScala)
 scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
-libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
+libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % LibraryVersions.scalatestPlayVersion % Test
diff --git a/play-scala/custom-error-handling/project/plugins.sbt b/play-scala/custom-error-handling/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")
+addSbtPlugin("org.playframework" % "sbt-plugin" % LibraryVersions.playVersion)
 addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.11.0")
diff --git a/play-scala/dependency-injection/build.sbt b/play-scala/dependency-injection/build.sbt
@@ -7,6 +7,6 @@ enablePlugins(PlayScala)
 scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
-libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
+libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % LibraryVersions.scalatestPlayVersion % Test
 libraryDependencies += "com.softwaremill.macwire" %% "macros" % "2.5.9" % Provided
 libraryDependencies += "com.softwaremill.macwire" %% "util" % "2.5.9"
diff --git a/play-scala/dependency-injection/project/plugins.sbt b/play-scala/dependency-injection/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")
+addSbtPlugin("org.playframework" % "sbt-plugin" % LibraryVersions.playVersion)
 addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.11.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
diff --git a/play-scala/introduction-to-play/build.sbt b/play-scala/introduction-to-play/build.sbt
@@ -8,4 +8,4 @@ enablePlugins(PlayScala)
 scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
-libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
+libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % LibraryVersions.scalatestPlayVersion % Test
diff --git a/play-scala/introduction-to-play/project/plugins.sbt b/play-scala/introduction-to-play/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")
+addSbtPlugin("org.playframework" % "sbt-plugin" % LibraryVersions.playVersion)
 addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.11.0")
diff --git a/play-scala/play-static-assets/build.sbt b/play-scala/play-static-assets/build.sbt
@@ -9,7 +9,7 @@ enablePlugins(SbtWeb)
 scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
-libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
+libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % LibraryVersions.scalatestPlayVersion % Test
 libraryDependencies += "org.webjars.bower" % "bootstrap-sass" % "3.3.7"
 
 // See https://github.com/sbt/sbt-js-engine/issues/68
diff --git a/play-scala/play-static-assets/project/plugins.sbt b/play-scala/play-static-assets/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")
+addSbtPlugin("org.playframework" % "sbt-plugin" % LibraryVersions.playVersion)
 addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.11.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-coffeescript" % "1.0.2")
 addSbtPlugin("com.github.platypii" % "sbt-typescript" % "4.6.4")
diff --git a/play-scala/play-templates/build.sbt b/play-scala/play-templates/build.sbt
@@ -8,4 +8,4 @@ enablePlugins(PlayScala)
 scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
-libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
+libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % LibraryVersions.scalatestPlayVersion % Test
diff --git a/play-scala/play-templates/project/plugins.sbt b/play-scala/play-templates/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")
+addSbtPlugin("org.playframework" % "sbt-plugin" % LibraryVersions.playVersion)
 addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.11.0")
diff --git a/play-scala/rest-api/build.sbt b/play-scala/rest-api/build.sbt
@@ -8,7 +8,7 @@ enablePlugins(PlayScala)
 scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
-libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
+libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % LibraryVersions.scalatestPlayVersion % Test
 
 // Adds additional packages into Twirl
 //TwirlKeys.templateImports += "com.baeldung.controllers._"
diff --git a/play-scala/rest-api/project/plugins.sbt b/play-scala/rest-api/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")
+addSbtPlugin("org.playframework" % "sbt-plugin" % LibraryVersions.playVersion)
 addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.11.0")
diff --git a/project/LibraryVersions.scala b/project/LibraryVersions.scala
@@ -0,0 +1,5 @@
+object LibraryVersions {
+  val playVersion = "3.0.4"
+  val playSlickVersion = "6.1.1"
+  val scalatestPlayVersion = "7.0.1"
+}

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")`
	`1`	`+addSbtPlugin("org.playframework" % "sbt-plugin" % LibraryVersions.playVersion)`
`2`	`2`	`addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.16.2")`