From 6f758e56e3ee6f52a48188dd614cf603d71d593a Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 9 Feb 2023 19:14:40 -0800 Subject: [PATCH 1/3] remove obsolete JDK options from testing setup --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 583d3fa..0fe524f 100644 --- a/build.sbt +++ b/build.sbt @@ -6,6 +6,6 @@ lazy val root = (project in file(".")). Test / test := { val _ = (Test / g8Test).toTask("").value }, - scriptedLaunchOpts ++= List("-Xms1024m", "-Xmx1024m", "-XX:ReservedCodeCacheSize=128m", "-XX:MaxPermSize=256m", "-Xss2m", "-Dfile.encoding=UTF-8"), + scriptedLaunchOpts ++= List("-Xms1024m", "-Xmx1024m", "-Xss2m", "-Dfile.encoding=UTF-8"), resolvers += Resolver.url("typesafe", url("https://repo.typesafe.com/typesafe/ivy-releases/"))(Resolver.ivyStylePatterns) ) From 92a918cb446a0779d0f14599b6ed4adcf57f10e0 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 9 Feb 2023 19:16:47 -0800 Subject: [PATCH 2/3] update README to link to Scala 3 template --- README.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cba0e02..b582ca2 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,20 @@ -This is a [Giter8][g8] template for Scala. +# Scala 2 seed template + +## Template usage + +This is a [Giter8][g8] template for Scala 2. ``` sbt new scala/scala-seed.g8 ``` -Template license ----------------- -Written in 2016-2021 by Lightbend, Inc. +## Looking for Scala 3 instead? + +That's over at https://github.com/scala/scala3.g8 + +# Template license + +Written in 2016-2023 by Lightbend, Inc. To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this template to the public domain worldwide. From ab767c0954e94ec31edf5d6ce35ec5a3fe0c5c7e Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 9 Feb 2023 19:19:50 -0800 Subject: [PATCH 3/3] fix and modernize GitHub Actions config --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7aa9a4d..ecfc89c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: test on: push: branches: - - main + - 2.13.x pull_request: jobs: test: @@ -10,12 +10,12 @@ jobs: fail-fast: false runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: coursier/cache-action@v6 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: distribution: temurin java-version: 8 - name: Test # This runs the template with the default parameters, and runs test within the templated app. - run: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M test + run: sbt -Dfile.encoding=UTF8 test