Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
keynmol committed Nov 15, 2024
1 parent d2b2ba2 commit f90c043
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 11 deletions.
18 changes: 13 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,33 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-12, macos-14]
os: [ubuntu-22.04, macos-14]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v4

- uses: coursier/cache-action@v6
- name: Setup
uses: actions/setup-java@v4
with:
java-version: 21
distribution: zulu
cache: sbt

- uses: sbt/setup-sbt@v1

- name: Setup
run: |
PLATFORM="$(uname)"
if [ $PLATFORM == "Darwin" ]; then
echo "It's a Mac"
brew install llvm@14 sbt
brew install llvm@17
else
echo "It's a Linux"
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 14
sudo ./llvm.sh 17
fi
- name: Compile examples
Expand Down
12 changes: 10 additions & 2 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
version = "3.8.3"

runner.dialect = scala3
rewrite.scala3.insertEndMarkerMinLines = 10
rewrite.scala3.removeOptionalBraces = true
rewrite.scala3.convertToNewSyntax = true
align.preset = more

fileOverride {
"glob:**.sbt" {
runner.dialect = scala212source3
}

"glob:**/project/**.*" {
"glob:**/project/plugins.sbt" {
runner.dialect = scala212source3
newlines.topLevelStatementBlankLines = [
{
blanks = 1,
minBreaks = 0
}
]
}
}

4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.indoorvivants" % "bindgen-sbt-plugin" % "0.0.24")
addSbtPlugin("com.indoorvivants" % "bindgen-sbt-plugin" % "0.1.4")

addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
3 changes: 1 addition & 2 deletions src/main/scala/test.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import lib_check.types.*
import scala.scalanative.unsafe.Zone

@main def hello =
Zone { implicit z =>
Zone:
val hello = Hello.apply(25, 135.0)
println(s"Result is: ${resolve(!hello, 42)}");
}

0 comments on commit f90c043

Please sign in to comment.