Skip to content

Commit dccd1cb

Browse files
Update dependencies: kindlings 0.1.2, sge-native-providers 0.1.1, multiarch-scala 0.1.2
- Bump kindlings 0.1.1 → 0.1.2, configure macro derivation timeout to 30s via -Xmacro-settings (prevents timeout on Rosetta x86_64) - Bump sge-native-providers 0.1.0 → 0.1.1 (objc.lib Windows stub, ANGLE Windows DLL + import libraries, GLFW/miniaudio Windows flags) - Bump multiarch-scala 0.1.1 → 0.1.2 (copy DLLs next to Scala Native executable on Windows — no rpath equivalent on PE) - Remove CI job timeouts (20min not enough for Rosetta)
1 parent 615868d commit dccd1cb

5 files changed

Lines changed: 10 additions & 9 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ jobs:
101101
test-jvm:
102102
name: JVM tests (${{ matrix.label }})
103103
runs-on: ${{ matrix.os }}
104-
timeout-minutes: 20
105104
strategy:
106105
fail-fast: false
107106
matrix:
@@ -200,7 +199,6 @@ jobs:
200199
test-native:
201200
name: Scala Native tests (${{ matrix.label }})
202201
runs-on: ${{ matrix.os }}
203-
timeout-minutes: 20
204202
strategy:
205203
fail-fast: false
206204
matrix:
@@ -257,7 +255,7 @@ jobs:
257255
name: Native FFI IT tests (${{ matrix.label }})
258256
needs: [test-native]
259257
runs-on: ${{ matrix.os }}
260-
timeout-minutes: 20
258+
261259
strategy:
262260
fail-fast: false
263261
matrix:
@@ -524,7 +522,6 @@ jobs:
524522
name: Verify release (${{ matrix.label }})
525523
needs: [test-jvm, test-native]
526524
runs-on: ${{ matrix.os }}
527-
timeout-minutes: 20
528525
strategy:
529526
fail-fast: false
530527
matrix:

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def collectClassFiles(classDir: File): Seq[(File, String)] =
6969
val versions = new {
7070
val scala = SgePlugin.scalaVersion
7171

72-
val kindlings = "0.1.1"
72+
val kindlings = "0.1.2"
7373
val sttp = "4.0.22"
7474
val xml = "2.3.0"
7575
val scribe = "3.17.0"
@@ -86,7 +86,7 @@ val versions = new {
8686
val munitScalacheck = "1.2.0"
8787

8888
// Native component providers (from sge-native-providers repo)
89-
val nativeComponents = "0.1.0"
89+
val nativeComponents = "0.1.1"
9090
val curlProvider = "0.1.1"
9191
}
9292

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.10")
99
// publishing
1010
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
1111
// multiarch-scala (Platform, NativeProviderPlugin, ZigCross, JvmPackaging)
12-
addSbtPlugin("com.kubuszok" % "sbt-multiarch-scala" % "0.1.1")
12+
addSbtPlugin("com.kubuszok" % "sbt-multiarch-scala" % "0.1.2")
1313
// coverage
1414
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.4")
1515

sge-build/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.10")
3333
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
3434

3535
// multiarch-scala — provides Platform, NativeProviderPlugin, ZigCross, JvmPackaging
36-
addSbtPlugin("com.kubuszok" % "sbt-multiarch-scala" % "0.1.1")
36+
addSbtPlugin("com.kubuszok" % "sbt-multiarch-scala" % "0.1.2")
3737

3838
// Sonatype snapshots for sbt-multi-arch-release
3939
resolvers += "Maven Central Snapshots" at "https://central.sonatype.com/repository/maven-snapshots"

sge-build/src/main/scala/sge/sbt/SgePlugin.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,11 @@ object SgePlugin extends AutoPlugin {
154154
"-Wrecurse-with-default",
155155
"-Wenum-comment-discard",
156156
"-Wunused:imports,privates,locals,patvars,nowarn",
157-
"-Wconf:cat=deprecation:info"
157+
"-Wconf:cat=deprecation:info",
158+
// Kindlings macro derivation timeout — raised for Rosetta x86_64 emulation
159+
// where macro expansion is ~3x slower than native ARM64.
160+
"-Xmacro-settings:jsoniterDerivation.timeout=30s",
161+
"-Xmacro-settings:ubjsonDerivation.timeout=30s"
158162
)
159163
)
160164

0 commit comments

Comments
 (0)