From 719f899edf5cf1737d59f2d732c2c5422fa4d9a4 Mon Sep 17 00:00:00 2001 From: Sherif Ebady Date: Wed, 27 Mar 2019 11:39:47 -0500 Subject: [PATCH] Update to squbs 0.12.0 --- build.sbt | 18 ++++++++++-------- project/build.properties | 2 +- project/giter8.sbt | 3 ++- src/main/g8/build.sbt | 8 ++++---- src/main/g8/default.properties | 2 +- src/main/g8/project/Versions.scala | 6 +++--- src/main/g8/project/build.properties | 2 +- src/main/g8/project/plugins.sbt | 2 +- 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/build.sbt b/build.sbt index d23363a..814f754 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,11 @@ lazy val root = (project in file(".")) - .settings( - name := "squbs-java-seed.g8", - test in Test := { - val _ = (g8Test in Test).toTask("").value - }, - scriptedLaunchOpts ++= List("-Xms1024m", "-Xmx1024m", "-XX:ReservedCodeCacheSize=128m", "-Xss2m", "-Dfile.encoding=UTF-8"), - resolvers += Resolver.url("typesafe", url("http://repo.typesafe.com/typesafe/ivy-releases/"))(Resolver.ivyStylePatterns) -) + .enablePlugins(ScriptedPlugin) + .settings( + name := "squbs-java-seed.g8", + Keys.test in Test := { + val _ = (g8Test in Test).toTask("").value + }, + scriptedLaunchOpts ++= List("-Xms1024m", "-Xmx1024m", "-XX:ReservedCodeCacheSize=128m", "-XX:MaxPermSize=256m", + "-Xss2m", "-Dfile.encoding=UTF-8"), + resolvers += Resolver.typesafeIvyRepo("releases") + ) diff --git a/project/build.properties b/project/build.properties index d6e3507..c0bab04 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.6 +sbt.version=1.2.8 diff --git a/project/giter8.sbt b/project/giter8.sbt index a3e2ba0..68f4d25 100644 --- a/project/giter8.sbt +++ b/project/giter8.sbt @@ -1 +1,2 @@ -addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.11.0") +addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.11.0") +libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 17c2a89..fd3bfd3 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -24,14 +24,14 @@ jacocoReportSettings := JacocoReportSettings( "Jacoco Coverage Report", None, JacocoThresholds( - instruction = 90, - method = 90, - line = 90), + instruction = 95, + method = 95, + line = 95), Seq(JacocoReportFormats.ScalaHTML), "utf-8") // Scoverage controls. Much cleaner here. Just Scala only. -coverageMinimum := 90 +coverageMinimum := 100 coverageFailOnMinimum := true libraryDependencies ++= Seq( diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index ceeefca..708e6bc 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -2,6 +2,6 @@ project=sample appname=squbs-java-seed organization=org.squbs version=0.1.0-SNAPSHOT -scala_version=2.12.5 +scala_version=2.12.8 desc=A sample squbs application in Java verbatim=*.png diff --git a/src/main/g8/project/Versions.scala b/src/main/g8/project/Versions.scala index cf776c3..e8855b1 100644 --- a/src/main/g8/project/Versions.scala +++ b/src/main/g8/project/Versions.scala @@ -1,7 +1,7 @@ object Versions { - val akkaV = "2.5.14" - val akkaHttpV = "10.1.3" - val squbsV = "0.11.0" + val akkaV = "2.5.21" + val akkaHttpV = "10.1.7" + val squbsV = "0.12.0" val jacksonV = "2.9.5" val akkaHttpJacksonV = "1.17.0" val junitV = "4.12" diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties index a31be40..c0bab04 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1 +1 @@ -sbt.version=1.0.4 \ No newline at end of file +sbt.version=1.2.8 diff --git a/src/main/g8/project/plugins.sbt b/src/main/g8/project/plugins.sbt index a7d3e1e..028b501 100644 --- a/src/main/g8/project/plugins.sbt +++ b/src/main/g8/project/plugins.sbt @@ -8,7 +8,7 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.1.0") -addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.10.1") +addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.12") addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.5.0")