From 6571f8ae99c999cfd0774c4fa091b9fdd03c7a68 Mon Sep 17 00:00:00 2001 From: Michael Skogberg Date: Sat, 28 Sep 2024 11:55:39 +0300 Subject: [PATCH] Include css --- build.sbt | 15 +++++++++++---- project/plugins.sbt | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index bb97d1ed..4346843e 100644 --- a/build.sbt +++ b/build.sbt @@ -48,7 +48,7 @@ val logstreamsDep = malliinaGroup %% "logstreams-client" % "1.10.1" val httpGroup = "org.apache.httpcomponents" -ThisBuild / scalaVersion := "2.13.12" +ThisBuild / scalaVersion := "2.13.15" val utilAudio = Project("util-audio", file("util-audio")) .enablePlugins(MavenCentralPlugin) @@ -253,6 +253,9 @@ lazy val pimpPlaySettings = !af.data.getAbsolutePath.endsWith(s"bundles\\nv-websocket-client-$nvWebSocketVersion.jar") }, Runtime / managedClasspath += (Assets / packageBin).value, + Assets / mappings ++= Seq( + (musicpimpFrontend / Compile / npmUpdate / crossTarget).value / "styles.css" -> "styles.css" + ), useTerminateProcess := true, Windows / msiMappings := (Windows / msiMappings).value.map { case (src, dest) => @@ -422,10 +425,14 @@ lazy val pimpcloudScalaJSSettings = Seq( def serverSettings = LinusPlugin.playSettings ++ Seq( // https://github.com/sbt/sbt-release releaseProcess := Seq[ReleaseStep]( - releaseStepTask(Compile / clean), checkSnapshotDependencies, - runTest, - releaseStepTask(ciBuild) + inquireVersions, + setReleaseVersion, + commitReleaseVersion, + tagRelease, + setNextVersion, + commitNextVersion, + pushChanges ), buildInfoKeys := Seq[BuildInfoKey]( name, diff --git a/project/plugins.sbt b/project/plugins.sbt index 265bde77..b1138e3a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ scalaVersion := "2.12.18" scalacOptions ++= Seq("-unchecked", "-deprecation", "-language:implicitConversions") -val utilsVersion = "1.6.30" +val utilsVersion = "1.6.40" Seq( "com.typesafe.play" % "sbt-plugin" % "2.8.20", @@ -9,7 +9,7 @@ Seq( "com.malliina" % "sbt-nodejs" % utilsVersion, "com.malliina" % "sbt-filetree" % utilsVersion, "com.malliina" % "sbt-packager" % "2.10.1", - "org.scala-js" % "sbt-scalajs" % "1.14.0", + "org.scala-js" % "sbt-scalajs" % "1.17.0", "org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2", "com.vmunier" % "sbt-web-scalajs" % "1.2.0", "com.typesafe.sbt" % "sbt-digest" % "1.1.4",