Skip to content

Build fixes for Native #88

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
joroKr21 merged 1 commit into from
May 21, 2022
Merged

Build fixes for Native #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 6 additions & 16 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,7 @@ val jsSettings = Def.settings(
)

val nativeSettings = Def.settings(
libraryDependencies += "org.scala-native" %%% "junit-runtime" % nativeVersion % Test,
addCompilerPlugin("org.scala-native" % "junit-plugin" % nativeVersion cross CrossVersion.full),
pomPostProcess := { node =>
import scala.xml._
import scala.xml.transform._
new RuleTransformer(new RewriteRule{
override def transform(n: Node) =
if (n.label == "dependency" && (n \ "artifactId").text.startsWith("junit-runtime_native"))
NodeSeq.Empty
else
n
}).transform(node)(0)
Comment on lines -21 to -30
Copy link
Member Author

@armanbilge armanbilge May 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can revert #65 because it was fixed upstream.

},
testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-s", "-v"),
mimaPreviousArtifacts := Set.empty,
tlVersionIntroduced := Map("3" -> "3.1.0")
Comment on lines -33 to +19
Copy link
Member Author

@armanbilge armanbilge May 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, you should never set mimaPreviousArtifacts := Set.empty, this is dangerous to forget :) Either

  • you are not publishing that module so .enablePlugins(NoPublishPlugin)
  • you have not published it yet, so tlVersionIntroduced := Map("3" -> "x.y.z")

)

// Aliases
Expand Down Expand Up @@ -93,6 +79,7 @@ lazy val deriving = crossProject(JSPlatform, JVMPlatform, NativePlatform)
)
)
.jsEnablePlugins(ScalaJSJUnitPlugin)
.nativeEnablePlugins(ScalaNativeJUnitPlugin)

lazy val derivingJVM = deriving.jvm
lazy val derivingJS = deriving.js
Expand All @@ -108,6 +95,7 @@ lazy val test = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.jsSettings(jsSettings)
.nativeSettings(nativeSettings)
.jsEnablePlugins(ScalaJSJUnitPlugin)
.nativeEnablePlugins(ScalaNativeJUnitPlugin)

lazy val testJVM = test.jvm
lazy val testJS = test.js
Expand All @@ -124,6 +112,7 @@ lazy val typeable = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.settings(mimaPreviousArtifacts := Set.empty) // Not yet
.nativeSettings(nativeSettings)
.jsEnablePlugins(ScalaJSJUnitPlugin)
.nativeEnablePlugins(ScalaNativeJUnitPlugin)

lazy val typeableJVM = typeable.jvm
lazy val typeableJS = typeable.js
Expand All @@ -143,6 +132,7 @@ lazy val local = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.settings(commonSettings)
.enablePlugins(NoPublishPlugin)
.jsEnablePlugins(ScalaJSJUnitPlugin)
.nativeEnablePlugins(ScalaNativeJUnitPlugin)

// Settings

Expand All @@ -152,8 +142,8 @@ lazy val commonSettings = Seq(
"-Yexplicit-nulls"
),
Compile / doc / sources := Nil,

libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % "test",
testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-s", "-v"),
)

ThisBuild / licenses := Seq("Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
Expand Down