From 94b19cb7ae01721b433a4068a861a5ef7e6ccddb Mon Sep 17 00:00:00 2001 From: Jamie Willis Date: Wed, 26 Mar 2025 15:30:38 +0000 Subject: [PATCH] build: enabled cross-compilation for native for tapir-openapi-docs, tapir-apispec-docs, and then tests (which may be irrelevant) --- build.sbt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 0f1a6ece51..83e96843f0 100644 --- a/build.sbt +++ b/build.sbt @@ -476,7 +476,7 @@ lazy val files: ProjectMatrix = (projectMatrix in file("files")) ) .jvmPlatform(scalaVersions = scala2And3Versions, settings = commonJvmSettings) .jsPlatform(scalaVersions = scala2And3Versions, settings = commonJsSettings) - .nativePlatform(scalaVersions = List(scala3)) + .nativePlatform(scalaVersions = scala2And3Versions, settings = commonNativeSettings) .dependsOn(core) lazy val testing: ProjectMatrix = (projectMatrix in file("testing")) @@ -510,6 +510,10 @@ lazy val tests: ProjectMatrix = (projectMatrix in file("tests")) scalaVersions = scala2And3Versions, settings = commonJsSettings ) + .nativePlatform( + scalaVersions = scala2And3Versions, + settings = commonNativeSettings + ) .dependsOn(core, files, circeJson, cats) lazy val perfServerJavaOptions = List( @@ -597,7 +601,7 @@ lazy val cats: ProjectMatrix = (projectMatrix in file("integrations/cats")) ) ) .nativePlatform( - scalaVersions = List(scala3), + scalaVersions = scala2And3Versions, settings = commonNativeSettings ++ Seq( libraryDependencies ++= Seq( "io.github.cquiroz" %%% "scala-java-time" % Versions.jsScalaJavaTime % Test @@ -789,7 +793,7 @@ lazy val circeJson: ProjectMatrix = (projectMatrix in file("json/circe")) ) .jvmPlatform(scalaVersions = scala2And3Versions, settings = commonJvmSettings) .jsPlatform(scalaVersions = scala2And3Versions, settings = commonJsSettings) - .nativePlatform(scalaVersions = List(scala3), settings = commonNativeSettings) + .nativePlatform(scalaVersions = scala2And3Versions, settings = commonNativeSettings) .dependsOn(core) lazy val json4s: ProjectMatrix = (projectMatrix in file("json/json4s")) @@ -1124,6 +1128,10 @@ lazy val apispecDocs: ProjectMatrix = (projectMatrix in file("docs/apispec-docs" scalaVersions = scala2And3Versions, settings = commonJsSettings ) + .nativePlatform( + scalaVersions = scala2And3Versions, + settings = commonNativeSettings + ) .dependsOn(core, tests % Test) lazy val openapiDocs: ProjectMatrix = (projectMatrix in file("docs/openapi-docs")) @@ -1144,6 +1152,10 @@ lazy val openapiDocs: ProjectMatrix = (projectMatrix in file("docs/openapi-docs" scalaVersions = scala2And3Versions, settings = commonJsSettings ) + .nativePlatform( + scalaVersions = scala2And3Versions, + settings = commonNativeSettings + ) .dependsOn(core, apispecDocs, tests % Test) lazy val openapiVerifier: ProjectMatrix = (projectMatrix in file("docs/openapi-verifier"))