From 396a0affe529b6ce8c4cc5f498f30ce4b592abcf Mon Sep 17 00:00:00 2001 From: Tobias Jonas Date: Wed, 12 Aug 2020 14:39:26 +0200 Subject: [PATCH] 2.1.0 --- README.md | 11 ++++++----- build.sbt | 10 +++++----- doc/changes.md | 10 ++++++++-- project/Build.scala | 2 +- project/Dependencies.scala | 21 +++++++++++---------- 5 files changed, 31 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index b2ec531d..5499f836 100755 --- a/README.md +++ b/README.md @@ -2,18 +2,19 @@ ### Status -[![codecov](https://codecov.io/gh/innFactory/bootstrap-play2/branch/master/graph/badge.svg)](https://codecov.io/gh/innFactory/bootstrap-play2) ![Run Tests](https://github.com/innFactory/bootstrap-play2/workflows/Run%20Tests/badge.svg) +![Cats Friendly Badge](https://typelevel.org/cats/img/cats-badge-tiny.png) [![codecov](https://codecov.io/gh/innFactory/bootstrap-play2/branch/master/graph/badge.svg)](https://codecov.io/gh/innFactory/bootstrap-play2) ![Run Tests](https://github.com/innFactory/bootstrap-play2/workflows/Run%20Tests/badge.svg) -![Cats Friendly Badge](https://typelevel.org/cats/img/cats-badge-tiny.png) ###### Scala, Akka, Play2, Slick, Flyway, Insomnia Bootstrap a rest service with Play2, isolated Slick and isolated Flyway This project is built with: - - Play Framework 2.8.1 - - Slick 3.3.2 - - Flyway-sbt & Flyway-Core 6.2.3 + - Play Framework 2.8.X + - Slick 3.3.X + - Flyway-sbt & Flyway-Core 6.5.X + - Akka 2.6.X + - Scala 2.13.X A PostgreSQL Database with activated postgis extensions is needed (for geolocation queries) diff --git a/build.sbt b/build.sbt index 574a196a..e18ad065 100755 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ import sbt.{ Def, _ } //settings name := """bootstrap-play2""" -scalaVersion := "2.13.3" +scalaVersion := Dependencies.scalaVersion val latest = sys.env.get("BRANCH") match { case Some(str) => if (str.equals("master")) true else false @@ -99,14 +99,14 @@ slickGen := Def.taskDyn(generateTablesTask((dbConf in Global).value)).value /*project definitions*/ lazy val firebaseAuth = (project in file("modules/firebase-auth")) - .settings(scalaVersion := "2.13.3") + .settings(scalaVersion := Dependencies.scalaVersion) lazy val root = (project in file(".")) .enablePlugins(PlayScala, DockerPlugin, SwaggerPlugin) .dependsOn(slick, firebaseAuth) .aggregate(firebaseAuth) .settings( - scalaVersion := "2.13.3", + scalaVersion := Dependencies.scalaVersion, dbConfSettings, libraryDependencies ++= Dependencies.list, // Adding Cache @@ -135,14 +135,14 @@ lazy val root = (project in file(".")) lazy val flyway = (project in file("modules/flyway")) .enablePlugins(FlywayPlugin) .settings( - scalaVersion := "2.13.3", + scalaVersion := Dependencies.scalaVersion, libraryDependencies ++= Dependencies.list, flywaySettings ) lazy val slick = (project in file("modules/slick")) .settings( - scalaVersion := "2.13.3", + scalaVersion := Dependencies.scalaVersion, libraryDependencies ++= Dependencies.list ) diff --git a/doc/changes.md b/doc/changes.md index 921b98d6..f9727209 100644 --- a/doc/changes.md +++ b/doc/changes.md @@ -1,12 +1,18 @@ -## Version 1.1.0 +## Version 2.1.0 > 12.08.2020 Upgrade to Scala 2.13.3 and latest lib versions. -## Version 1.0.0 +## Version 2.0.0 > 15.05.2020 First stable Version + +## Version 1.X.X + +> XX.XX.2018 + +Legacy Version \ No newline at end of file diff --git a/project/Build.scala b/project/Build.scala index 3a63ee86..071f5c5a 100755 --- a/project/Build.scala +++ b/project/Build.scala @@ -5,7 +5,7 @@ object Common { def projectSettings = Seq( - scalaVersion := "2.13.3", //todo fix several version statements in sbt files + scalaVersion := Dependencies.scalaVersion, //todo fix several version statements in sbt files // javacOptions ++= Seq("-source", "11", "-target", "11"), scalacOptions ++= Seq( "-encoding", diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c388adee..ce3afb8c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -3,12 +3,13 @@ import sbt._ object Dependencies { - val AkkaVersion = "2.6.8" - val akkaTyped = "com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion - val akka = "com.typesafe.akka" %% "akka-actor" % AkkaVersion - val akkaJackson = - "com.typesafe.akka" %% "akka-serialization-jackson" % AkkaVersion // https://github.com/akka/akka/issues/29351 - val akkaStreams = "com.typesafe.akka" %% "akka-stream" % AkkaVersion + val scalaVersion = "2.13.3" + val akkaVersion = "2.6.8" + val akkaTyped = "com.typesafe.akka" %% "akka-actor-typed" % akkaVersion + val akka = "com.typesafe.akka" %% "akka-actor" % akkaVersion + val akkaJackson = + "com.typesafe.akka" %% "akka-serialization-jackson" % akkaVersion // https://github.com/akka/akka/issues/29351 + val akkaStreams = "com.typesafe.akka" %% "akka-stream" % akkaVersion //Prod val slickPg = "com.github.tminglei" %% "slick-pg" % "0.19.2" @@ -20,8 +21,8 @@ object Dependencies { val slick = "com.typesafe.slick" %% "slick" % "3.3.2" val slickCodegen = "com.typesafe.slick" %% "slick-codegen" % "3.3.2" val slickHikaricp = "com.typesafe.slick" %% "slick-hikaricp" % "3.3.2" - val HikariCP = "com.zaxxer" % "HikariCP" % "3.4.5" - val Joda = "joda-time" % "joda-time" % "2.10.6" + val hikariCP = "com.zaxxer" % "HikariCP" % "3.4.5" + val joda = "joda-time" % "joda-time" % "2.10.6" val flyWayCore = "org.flywaydb" % "flyway-core" % "6.5.4" val postgresql = "org.postgresql" % "postgresql" % "42.2.14" @@ -44,8 +45,8 @@ object Dependencies { slick, slickCodegen, slickHikaricp, - HikariCP, - Joda, + hikariCP, + joda, flyWayCore, postgresql, scalatestPlus,