Skip to content

Commit a1af961

Browse files
authored
Fix ci build and upgrade to latest libs (#207)
1 parent b25278a commit a1af961

File tree

6 files changed

+23
-18
lines changed

6 files changed

+23
-18
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,24 @@ name: CI
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master, main]
66
pull_request:
7-
branches: [ master ]
7+
branches: [master, main]
88

99
jobs:
1010
build:
1111

1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
16-
- name: Set up JDK 11
17-
uses: actions/setup-java@v1
15+
- uses: actions/checkout@v4
1816
with:
19-
java-version: 11
17+
fetch-depth: 0
18+
- name: Setup sbt
19+
uses: sbt/setup-sbt@v1
20+
- name: Set up JDK 21
21+
uses: actions/setup-java@v4
22+
with:
23+
distribution: temurin
24+
java-version: 21
2025
- run: ./ci/checksourcemaps.sh

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.8
1+
sbt.version=1.10.11

project/plugins.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
22

33
// needed for the tests (ci/checksourcemaps.sh)
4-
addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2")
4+
addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.17.0")
55
// needed to make sbt-giter8 work with SBT >= v1.2.x
66
libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value }
77

88
// add the below dependencies in the template build, so that Scala Steward can update versions in the giter8 template
99
addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.3.0")
10-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
11-
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1")
10+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0")
11+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.7")
1212
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
13-
addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.2")
14-
addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.4")
13+
addSbtPlugin("com.github.sbt" % "sbt-gzip" % "2.0.0")
14+
addSbtPlugin("com.github.sbt" % "sbt-digest" % "2.1.0")

src/main/g8/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ThisBuild / organization := "$organization$"
2-
ThisBuild / scalaVersion := "2.13.12"
2+
ThisBuild / scalaVersion := "2.13.16"
33
ThisBuild / version := "0.1.0-SNAPSHOT"
44

55
lazy val root = (project in file("."))
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.8
1+
sbt.version=1.10.11

src/main/g8/project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml"
44
logLevel := Level.Warn
55

66
addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.3.0")
7-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
8-
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1")
7+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0")
8+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.7")
99
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
10-
addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.2")
11-
addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.4")
10+
addSbtPlugin("com.github.sbt" % "sbt-gzip" % "2.0.0")
11+
addSbtPlugin("com.github.sbt" % "sbt-digest" % "2.1.0")

0 commit comments

Comments
 (0)