diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..05313fd --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.7.17 +179803f2659eaeaf96236283ae550f96b561eac3 diff --git a/.scalafmt.conf b/.scalafmt.conf new file mode 100644 index 0000000..77f6478 --- /dev/null +++ b/.scalafmt.conf @@ -0,0 +1,11 @@ +version = 3.7.17 +align.preset = more +maxColumn = 100 +runner.dialect = scala213 + +rewrite.rules = [ + RedundantBraces +] +project.excludeFilters = [ + "target" +] diff --git a/build.sbt b/build.sbt index 84dc087..0a30e36 100644 --- a/build.sbt +++ b/build.sbt @@ -1,3 +1,5 @@ +ThisBuild / scalaVersion := "2.13.14" + lazy val root = (project in file(".")) .enablePlugins(ScriptedPlugin) .settings( @@ -5,7 +7,15 @@ lazy val root = (project in file(".")) 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("https://repo.typesafe.com/typesafe/ivy-releases/"))(Resolver.ivyStylePatterns) + scriptedLaunchOpts ++= List( + "-Xms1024m", + "-Xmx1024m", + "-XX:ReservedCodeCacheSize=128m", + "-Xss2m", + "-Dfile.encoding=UTF-8" + ), + resolvers += Resolver.url("typesafe", url("https://repo.typesafe.com/typesafe/ivy-releases/"))( + Resolver.ivyStylePatterns + ) ) .settings(Dependencies.core) diff --git a/project/plugins.sbt b/project/plugins.sbt index c9e5a23..90c888a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.16.2") -libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } +libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") diff --git a/src/main/g8/.scalafmt.conf b/src/main/g8/.scalafmt.conf index 2ca4c1f..77f6478 100644 --- a/src/main/g8/.scalafmt.conf +++ b/src/main/g8/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.14 +version = 3.7.17 align.preset = more maxColumn = 100 runner.dialect = scala213 diff --git a/src/main/g8/README.md b/src/main/g8/README.md index 967dc43..e3a87a7 100644 --- a/src/main/g8/README.md +++ b/src/main/g8/README.md @@ -1,4 +1,4 @@ -# API Gateway triggered Lambda +# $name$ [![CI](https://github.com/$github_org$/$repo_name$/actions/workflows/ci.yml/badge.svg)](https://github.com/$github_org$/$repo_name$/actions/workflows/ci.yml) [![ECR cleanup](https://github.com/$github_org$/$repo_name$/workflows/ecr_cleanup.yml/badge.svg)](https://github.com/$github_org$/$repo_name$/actions/workflows/ecr_cleanup.yml) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 23180fe..5df9869 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -4,7 +4,7 @@ scalacOptions += "-Xfatal-warnings" ThisBuild / organization := "com.$github_org;format="camel,lower"$" ThisBuild / organizationName := "$github_org$" -ThisBuild / scalaVersion := "2.13.12" +ThisBuild / scalaVersion := "2.13.14" val projectName = "$repo_name$"