Skip to content

Commit 65d2d08

Browse files
authored
Update copyright, Scala Native, Scala, sbt, ubuntu and macOS to current versions (#107)
* Update Scala Native, Scala, & sbt to current versions * Update CI ubuntu and macOS os versions * Update java and setup-java version & java provider * Ensure macOS environment has 'sbt' command * Install sbt only on macOS * Restore 'adopt' JDK distribution, per review suggestion
1 parent e4d3d83 commit 65d2d08

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,21 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
os: [ubuntu-20.04, macos-11]
14-
java: [ '17' ]
13+
os: [ubuntu-22.04, macos-13]
14+
java: [ '21' ]
1515
runs-on: ${{ matrix.os }}
1616
steps:
1717
- name: Checkout current branch (full)
1818
uses: actions/checkout@v3
1919
- name: Setup Java
20-
uses: actions/setup-java@v3
20+
uses: actions/setup-java@v4
2121
with:
2222
distribution: 'adopt'
2323
java-version: ${{ matrix.java }}
2424
cache: 'sbt'
25+
- name: Install common dependencies
26+
shell: bash
27+
if: ${{ startsWith(matrix.os, 'macos') }}
28+
run: brew install sbt
2529
- name: Run tests (${{ matrix.os }}) Java ${{ matrix.java }}
2630
run: sbt g8Test

project/build.properties

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

src/main/g8/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scalaVersion := "3.3.3" // A Long Term Support version.
1+
scalaVersion := "3.3.6" // A Long Term Support version.
22

33
enablePlugins(ScalaNativePlugin)
44

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

src/main/g8/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
1+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7")

0 commit comments

Comments
 (0)