Skip to content

Commit

Permalink
restore shapelessNative and portable-scala-reflect dependency (#1242)
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k authored Jun 2, 2024
1 parent 3eacd15 commit 914f0e6
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 32 deletions.
10 changes: 4 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ lazy val specs2 = project.in(file(".")).
analysisJVM, shapelessJVM, formJVM, markdownJVM, gwtJVM, junitJVM, scalacheckJVM, mockJVM, xmlJVM,
tests, fpJS, catsJS, commonJS, matcherJS, coreJS, matcherExtraJS, scalazJS, analysisJS,
shapelessJS, junitJS, scalacheckJS, mockJS, fpNative, catsNative, commonNative, matcherNative,
coreNative, matcherExtraNative, scalazNative, analysisNative, junitNative,
coreNative, matcherExtraNative, scalazNative, analysisNative, shapelessNative, junitNative,
scalacheckNative, mockNative
)

Expand Down Expand Up @@ -64,7 +64,7 @@ lazy val commonJsNativeSettings = Seq(

lazy val specs2Version = settingKey[String]("defines the current specs2 version")
lazy val scalazVersion = settingKey[String]("defines the current scalaz version")
lazy val shapelessVersion = "2.3.7"
lazy val shapelessVersion = "2.3.12"
lazy val catsVersion = "2.6.1"
lazy val catsEffectVersion = "3.1.1"

Expand Down Expand Up @@ -303,7 +303,7 @@ lazy val pom = Project(id = "pom", base = file("pom")).
dependsOn(catsJVM, commonJVM, matcherJVM, matcherExtraJVM, coreJVM, scalazJVM, html, analysisJVM,
shapelessJVM, formJVM, markdownJVM, gwtJVM, junitJVM, scalacheckJVM, mockJVM)

lazy val shapeless = crossProject(JSPlatform, JVMPlatform).
lazy val shapeless = crossProject(JSPlatform, JVMPlatform, NativePlatform).
crossType(CrossType.Pure).
in(file("shapeless")).
settings(
Expand All @@ -319,9 +319,7 @@ lazy val shapeless = crossProject(JSPlatform, JVMPlatform).

lazy val shapelessJS = shapeless.js
lazy val shapelessJVM = shapeless.jvm

// TODO https://github.com/milessabin/shapeless/issues/1355
// lazy val shapelessNative = shapeless.native
lazy val shapelessNative = shapeless.native

lazy val scalaz = crossProject(JSPlatform, JVMPlatform, NativePlatform).in(file("scalaz")).
settings(
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

5 changes: 3 additions & 2 deletions project/depends.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ object depends {
def jvmTest =
libraryDependencies ++= Seq(
"org.scala-sbt" % "test-interface" % "1.0",
"org.portable-scala" %%% "portable-scala-reflect" % "1.1.1",
"org.portable-scala" %%% "portable-scala-reflect" % "1.1.3",
"org.scala-js" %% "scalajs-stubs" % "1.0.0" % "provided")

def jsTest =
Seq(libraryDependencies ++= Seq(
"org.scala-js" %% "scalajs-test-interface" % scalaJSVersion,
"org.portable-scala" %%% "portable-scala-reflect" % "1.1.1"),
"org.portable-scala" %%% "portable-scala-reflect" % "1.1.3"),
Test / scalaJSStage := FastOptStage) ++ jsMacrotaskExecutor

def jsMacrotaskExecutor =
Expand All @@ -37,6 +37,7 @@ object depends {
def nativeTest =
Seq(libraryDependencies ++= Seq(
"org.scala-native" %%% "test-interface" % nativeVersion,
"org.portable-scala" %%% "portable-scala-reflect" % "1.1.3"
))

def scalaParser = Def.setting {
Expand Down

0 comments on commit 914f0e6

Please sign in to comment.