Adjust for SN 0.5.0-RC1 (#124)

indoorvivants · Mar 2, 2024 · 92fb8b4 · 92fb8b4
1 parent f62ce25
commit 92fb8b4
Show file tree

Hide file tree

Showing 27 changed files with 690 additions and 11,756 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-        os: [macos-12, ubuntu-22.04]
+        os: [macos-14, ubuntu-22.04]
         segment: [1, 2, 3]
     runs-on: ${{ matrix.os }}
     steps:
@@ -27,15 +27,15 @@ jobs:
           java-version: '17'
           cache: sbt
 
-      - name: Cache vcpkg
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/Library/Caches/sbt-vcpkg/vcpkg-install
-            ~/Library/Caches/sbt-vcpkg/vcpkg
-            ~/.cache/sbt-vcpkg/vcpkg-install
-            ~/.cache/sbt-vcpkg/vcpkg
-          key: ${{ runner.os }}-sbt-vcpkg-${{ matrix.segment }}
+      # - name: Cache vcpkg
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: |
+      #       ~/Library/Caches/sbt-vcpkg/vcpkg-install
+      #       ~/Library/Caches/sbt-vcpkg/vcpkg
+      #       ~/.cache/sbt-vcpkg/vcpkg-install
+      #       ~/.cache/sbt-vcpkg/vcpkg
+      #     key: ${{ runner.os }}-sbt-vcpkg-${{ matrix.segment }}
 
       - uses: rui314/setup-mold@v1
 
@@ -48,15 +48,15 @@ jobs:
           PLATFORM="$(uname)"
           if [ $PLATFORM == "Darwin" ]; then
             echo "It's a Mac"
-            brew install llvm@14 ninja
-            echo "LLVM_BIN=/usr/local/opt/llvm@14/bin" >> $GITHUB_ENV
+            brew install llvm@17 ninja sbt autoconf
+            echo "LLVM_BIN=/opt/homebrew/opt/llvm@17/bin" >> $GITHUB_ENV
           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
             sudo apt-get install ninja-build
-            echo "LLVM_BIN=/usr/lib/llvm-14/bin" >> $GITHUB_ENV
+            echo "LLVM_BIN=/usr/lib/llvm-17/bin" >> $GITHUB_ENV
           fi
 
       - name: Setup for examples

diff --git a/build.sbt b/build.sbt
@@ -1,3 +1,5 @@
+import scala.scalanative.build.SourceLevelDebuggingConfig
+import scala.scalanative.build.OptimizerConfig
 import bindgen.plugin.BindgenMode
 import com.indoorvivants.detective.Platform.OS.*
 import com.indoorvivants.detective.Platform
@@ -10,7 +12,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 
 lazy val Versions = new {
-  val Scala = "3.3.1"
+  val Scala = "3.3.3"
 }
 
 lazy val root = project
@@ -136,6 +138,7 @@ lazy val git = project
       Binding(vcpkgConfigurator.value.includes("libgit2") / "git2.h", "libgit")
         .withLinkName("git2")
         .withCImports(List("git2.h"))
+        .withLogLevel(bindgen.interface.LogLevel.Info)
         .withClangFlags(
           vcpkgConfigurator.value.pkgConfig
             .updateCompilationFlags(List("-fsigned-char"), "libgit2")
@@ -429,6 +432,7 @@ lazy val openssl = project
   .settings(
     vcpkgDependencies := VcpkgDependencies("openssl"),
     scalaVersion := Versions.Scala,
+    nativeConfig ~= {(_).withSourceLevelDebuggingConfig(SourceLevelDebuggingConfig.enabled)},
     bindgenBindings := {
       Seq(
         Binding(