Skip to content

Update copyright, Scala Native, Scala, sbt, ubuntu and macOS to current versions #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 15, 2025
Merged

Update copyright, Scala Native, Scala, sbt, ubuntu and macOS to current versions #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e8a1d1c
Update Scala Native, Scala, & sbt to current versions
LeeTibbert May 17, 2025
04f4210
Update CI ubuntu and macOS os versions
LeeTibbert Jun 3, 2025
926313c
Update java and setup-java version & java provider
LeeTibbert Jun 3, 2025
4e3bb73
Ensure macOS environment has 'sbt' command
LeeTibbert Jun 3, 2025
5b6d98d
Install sbt only on macOS
LeeTibbert Jun 3, 2025
dd6c450
Restore 'adopt' JDK distribution, per review suggestion
LeeTibbert Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,21 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-11]
java: [ '17' ]
os: [ubuntu-22.04, macos-13]
java: [ '21' ]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v3
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: ${{ matrix.java }}
cache: 'sbt'
- name: Install common dependencies
shell: bash
if: ${{ startsWith(matrix.os, 'macos') }}
run: brew install sbt
- name: Run tests (${{ matrix.os }}) Java ${{ matrix.java }}
run: sbt g8Test
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.10.6
sbt.version = 1.10.11
2 changes: 1 addition & 1 deletion src/main/g8/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scalaVersion := "3.3.3" // A Long Term Support version.
scalaVersion := "3.3.6" // A Long Term Support version.

enablePlugins(ScalaNativePlugin)

Expand Down
2 changes: 1 addition & 1 deletion src/main/g8/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.10.6
sbt.version = 1.10.11
2 changes: 1 addition & 1 deletion src/main/g8/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7")