Skip to content

Commit acc60e8

Browse files
authored
Merge pull request #103 from SethTisue/misc-improvements
update readme, tweak build
2 parents 41b1aae + ab767c0 commit acc60e8

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ name: test
22
on:
33
push:
44
branches:
5-
- main
5+
- 2.13.x
66
pull_request:
77
jobs:
88
test:
99
strategy:
1010
fail-fast: false
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
- uses: coursier/cache-action@v6
15-
- uses: actions/setup-java@v2
15+
- uses: actions/setup-java@v3
1616
with:
1717
distribution: temurin
1818
java-version: 8
1919
- name: Test
2020
# This runs the template with the default parameters, and runs test within the templated app.
21-
run: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M test
21+
run: sbt -Dfile.encoding=UTF8 test

README.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1-
This is a [Giter8][g8] template for Scala.
1+
# Scala 2 seed template
2+
3+
## Template usage
4+
5+
This is a [Giter8][g8] template for Scala 2.
26

37
```
48
sbt new scala/scala-seed.g8
59
```
610

7-
Template license
8-
----------------
9-
Written in 2016-2021 by Lightbend, Inc.
11+
## Looking for Scala 3 instead?
12+
13+
That's over at https://github.com/scala/scala3.g8
14+
15+
# Template license
16+
17+
Written in 2016-2023 by Lightbend, Inc.
1018

1119
To the extent possible under law, the author(s) have dedicated all copyright and related
1220
and neighboring rights to this template to the public domain worldwide.

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ lazy val root = (project in file(".")).
66
Test / test := {
77
val _ = (Test / g8Test).toTask("").value
88
},
9-
scriptedLaunchOpts ++= List("-Xms1024m", "-Xmx1024m", "-XX:ReservedCodeCacheSize=128m", "-XX:MaxPermSize=256m", "-Xss2m", "-Dfile.encoding=UTF-8"),
9+
scriptedLaunchOpts ++= List("-Xms1024m", "-Xmx1024m", "-Xss2m", "-Dfile.encoding=UTF-8"),
1010
resolvers += Resolver.url("typesafe", url("https://repo.typesafe.com/typesafe/ivy-releases/"))(Resolver.ivyStylePatterns)
1111
)

0 commit comments

Comments
 (0)