Skip to content
This repository was archived by the owner on Jul 20, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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")
)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.1.6
sbt.version=1.2.8
3 changes: 2 additions & 1 deletion project/giter8.sbt
Original file line number Diff line number Diff line change
@@ -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 }
8 changes: 4 additions & 4 deletions src/main/g8/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion src/main/g8/default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions src/main/g8/project/Versions.scala
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/main/g8/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.0.4
sbt.version=1.2.8
2 changes: 1 addition & 1 deletion src/main/g8/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down