8000 stLib on sbt 2, update the ScalablyTyped converter by rleibman · Pull Request #12 · rleibman/chuti · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 15 additions & 7 deletions stLib/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,27 @@ startYear := Some(2024)
organizationName := "Roberto Leibman"
headerLicense := Some(HeaderLicense.MIT("2024", "Roberto Leibman", HeaderLicenseStyle.Detailed))
name := "chuti-stlib"
useYarn := true
stUseYarn := true
stOutputPackage := "net.leibman.chuti"
stFlavour := Flavour.ScalajsReact

// sbt 2 has cross-platform support built in: `%%` resolves the Scala.js (_sjs1_3) artifacts here.
libraryDependencies ++= Seq(
"com.github.japgolly.scalajs-react" %%% "core" % scalajsReactVersion,
"com.github.japgolly.scalajs-react" %%% "extra" % scalajsReactVersion
"com.github.japgolly.scalajs-react" %% "core" % scalajsReactVersion,
"com.github.japgolly.scalajs-react" %% "extra" % scalajsReactVersion
)

dependencyOverrides += "com.github.japgolly.scalajs-react" %%% "core" % scalajsReactVersion
dependencyOverrides += "com.github.japgolly.scalajs-react" %% "core" % scalajsReactVersion

// The converter pins scalajs-react 2.1.3 in every generated facade, while we compile against a newer one. sbt 2 turns
// that major-version eviction into an error (sbt 1 only warned).
libraryDependencySchemes ++= Seq(
"com.github.japgolly.scalajs-react" % "core_sjs1_3" % VersionScheme.Always,
"com.github.japgolly.scalajs-react" % "extra_sjs1_3" % VersionScheme.Always
)

/* javascript / typescript deps */
Compile / npmDependencies ++= Seq(
Compile / stNpmDependencies ++= Seq(
"@types/react" -> reactVersion,
"@types/react-dom" -> reactVersion,
"react" -> reactVersion,
Expand All @@ -40,7 +48,7 @@ Compile / npmDependencies ++= Seq(
"semantic-ui-react" -> "^2.1.5"
)

Test / npmDependencies ++= Seq(
Test / stNpmDependencies ++= Seq(
"react" -> reactVersion,
"react-dom" -> reactVersion
)
Expand All @@ -54,6 +62,6 @@ stMinimize := Selection.AllExcept("semantic-ui-react")
stIgnore ++= List(
)

licenses += ("MIT", url("http://opensource.org/licenses/MIT"))
licenses += ("MIT", uri("http://opensource.org/licenses/MIT"))

doc / sources := Nil
2 changes: 1 addition & 1 deletion stLib/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.12.4
sbt.version = 2.0.8
15 changes: 8 additions & 7 deletions stLib/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
////////////////////////////////////////////////////////////////////////////////////
// Common stuff
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1")
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0")
// No sbt2 build of sbt-explicit-dependencies.
// addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1")

////////////////////////////////////////////////////////////////////////////////////
// Web client
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta45")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.4.0")
addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta45-local777-SNAPSHOT")

libraryDependencies ++= Seq("org.eclipse.jgit" % "org.eclipse.jgit" % "7.5.0.202512021534-r")
libraryDependencies ++= Seq("org.eclipse.jgit" % "org.eclipse.jgit" % "7.7.1.202607240634-r")
Loading
0