Skip to content

Commit a92ab74

Browse files
Merge pull request #54 from sh0hei/update/scala-2.12.13
Update scala to 2.12.13
2 parents c6af808 + b8cfd7a commit a92ab74

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,8 @@ jobs:
2222
strategy:
2323
matrix:
2424
os: [ubuntu-latest]
25-
scala: [2.12.2]
26-
java:
27-
28-
29-
25+
scala: [2.12.13]
26+
3027
runs-on: ${{ matrix.os }}
3128
steps:
3229
- name: Checkout current branch (full)
@@ -59,4 +56,4 @@ jobs:
5956

6057
- run: 'sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M test'
6158

62-
- run: pushd target/sbt-test/dotty-template/scripted && sbt run test && popd
59+
- run: pushd target/sbt-test/scala3-template/scripted && sbt run test && popd

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ script:
1111
## This runs the template with the default parameters, and runs test within the templated app.
1212
- sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M test
1313

14-
- pushd target/sbt-test/dotty-template/scripted
14+
- pushd target/sbt-test/scala3-template/scripted
1515
- sbt run test
1616
- popd

build.sbt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// This build is for this Giter8 template.
22
// To test the template run `g8` or `g8Test` from the sbt session.
33
// See http://www.foundweekends.org/giter8/testing.html#Using+the+Giter8Plugin for more details.
4-
lazy val scalaVersions = Seq("2.12.2")
4+
lazy val scalaVersions = Seq("2.12.13")
55
lazy val root = project
66
.in(file("."))
77
.settings(
8-
name := "dotty-template",
8+
name := "scala3-template",
99
Test / test := {
1010
val _ = (Test / g8Test).toTask("").value
1111
},
@@ -14,13 +14,12 @@ lazy val root = project
1414
crossScalaVersions := scalaVersions
1515
)
1616

17-
ThisBuild / githubWorkflowJavaVersions := Seq("[email protected].0-275", "[email protected].0-9", "[email protected].0-1")
17+
ThisBuild / githubWorkflowJavaVersions := Seq("[email protected]", "[email protected]", "[email protected]")
1818
ThisBuild / githubWorkflowScalaVersions := scalaVersions
1919
ThisBuild / githubWorkflowBuildPostamble := Seq(
2020
// This runs the template with the default parameters, and runs test within the templated app.
2121
WorkflowStep.Run(List("sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M test")),
22-
23-
WorkflowStep.Run(List("pushd target/sbt-test/dotty-template/scripted && sbt run test && popd")),
22+
WorkflowStep.Run(List("pushd target/sbt-test/scala3-template/scripted && sbt run test && popd")),
2423
)
2524
ThisBuild / githubWorkflowPublishTargetBranches := Nil
2625
Global / onChangedBuildSource := ReloadOnSourceChanges

0 commit comments

Comments
 (0)