Commit 66a3c73d authored by 35V LG84's avatar 35V LG84

build: update crossproject

Use new features of crossproject with build.sbt
and fix few version typos in Changelog
Signed-off-by: 35V LG84's avatar35V LG84 <35vlg84-x4e6b92@e257.fi>
parent 46bb90c5
Pipeline #68542270 passed with stage
in 10 minutes and 40 seconds
......@@ -38,13 +38,15 @@ Updated deps and tools:
* Dependencies
** better-files: 3.8.0
** cats: 0.12.0-M3
** circe: 0.12.0-M4
** cats: 2.0.0-M4
** circe: 0.12.0-M3
** jgit: 5.4.0.201906121030-r
** scallop: 3.3.1
* Build
** sbt-git: 1.0.0 (new)
** sbt-scalajs: 0.6.28
** sbt-crossproject: 0.6.1
** sbt-scalajs-crossproject: 0.6.1
** sbt-wartremover: 2.4.2
* Tests
** dirsuite: 0.30.1
......
......@@ -68,8 +68,8 @@ lazy val commonSettings = Seq(
* circular dependencies with sub-projects
*/
lazy val tackler = (project in file(".")).
aggregate(apiJS, apiJVM, core, cli).
dependsOn(apiJS, apiJVM, core, cli).
aggregate(api.js, api.jvm, core, cli).
dependsOn(api.js, api.jvm, core, cli).
settings(noPublishSettings).
settings(commonSettings: _*).
settings(
......@@ -94,13 +94,9 @@ lazy val api = crossProject(JSPlatform, JVMPlatform).
Test / test := {}
)
lazy val apiJVM = api.jvm
lazy val apiJS = api.js
lazy val core = (project in file("core")).
dependsOn(apiJVM).
dependsOn(api.jvm).
enablePlugins(Antlr4Plugin).
configs(IntegrationTest).
settings(Defaults.itSettings).
......
......@@ -4,8 +4,8 @@ addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.2")
// ScalaJS
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")
addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.6.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.6.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
// build & release
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment