Buildscript cleanup

Author: v6ak

build.sbt

@@ -18,11 +18,6 @@ val moveLibs = taskKey[Pipeline.Stage]("Moves libraries")
 
 val removeUnversionedAssets = taskKey[Pipeline.Stage]("Removes unversioned assets")
 
-val explicitlyExcludedLibFiles = Set(
-  "lib/bootstrap/fonts/glyphicons-halflings-regular.eot", "lib/bootstrap/fonts/glyphicons-halflings-regular.svg",
-  "lib/bootstrap/fonts/glyphicons-halflings-regular.ttf", "lib/bootstrap/fonts/glyphicons-halflings-regular.woff2"
-)
-
 val genHtmlDir =  settingKey[File]("Output directory for HTML generated files")
 
 val PublicDirName = "statistiky" // TODO: DRY this constant from routes
@@ -58,13 +53,10 @@ lazy val server = (project in file("server")).settings(
   scalacOptions ++= Seq("-deprecation", "-feature"),
   scalaVersion := scalaV2,
   scalaJSProjects := Seq(client),
-  scalaJSStage := FullOptStage,
   Assets / pipelineStages := Seq(scalaJSPipeline),
   pipelineStages := Seq(concat, removeLibs, filter, digest, simpleUrlUpdate/*, digest*/, removeUnversionedAssets, moveLibs),
   digest / includeFilter := "*",
-  digest / excludeFilter := "*.html" || "*.csv" || "*.json" || "*.json.new" ||
-    // When sbt-simple-url-update updates path for glyphicons-halflings-regular.woff, it garbles the path for glyphicons-halflings-regular.woff2.
-    "glyphicons-halflings-regular.woff",
+  digest / excludeFilter := "*.html" || "*.csv" || "*.json" || "*.json.new",
   filter / excludeFilter := "*.scss" || "*.note" || "*.source" || "*.css" - "main.css" || "*.js" - "main.min.js",
   filter / includeFilter := "*.css" || "*.html" || "*.js" || "*.csv" || "*.svg" || "*.woff" || "*.ttf" || "*.eot" || "*.woff2" || "*.json.new",
   genHtmlDir := target.value / "web" / "html" / "main",
@@ -88,7 +80,7 @@ lazy val server = (project in file("server")).settings(
     }
   }.taskValue,
   removeUnversionedAssets := { mappings: Seq[PathMapping] =>
-    mappings.filter{case (file, name) => !(name.startsWith("main.") || explicitlyExcludedLibFiles.contains(name))}
+    mappings.filter{case (file, name) => !(name.startsWith("main.") )}
   },
   removeLibs := { mappings: Seq[PathMapping] => // Most of libs are already included in a CSS/JS file, so skip them
     mappings.filter{case (file, name) => (!name.startsWith("lib/")) || name.startsWith("lib/bootstrap/fonts")}
@@ -109,7 +101,7 @@ lazy val server = (project in file("server")).settings(
     "org.webjars" % "bootstrap" % bootstrapVersion,
     specs2 % Test
   ),
-).enablePlugins(PlayScala, SbtWeb, WebScalaJSBundlerPlugin)//.dependsOn(sharedJvm)
+).enablePlugins(PlayScala, SbtWeb, WebScalaJSBundlerPlugin)
 
 // Generates client JS; other assets are generated by the server subproject
 lazy val client = (project in file("client")).settings(
@@ -137,15 +129,7 @@ lazy val client = (project in file("client")).settings(
   ),
   stIgnore ++= List("moment", "moment-timezone", "bootstrap", "chart.js", "chartjs-adapter-moment",
     "comma-separated-values"),
-).enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin, ScalablyTypedConverterPlugin)//.dependsOn(sharedJs)
-
-/*lazy val shared = (crossProject.crossType(CrossType.Pure) in file("shared")).
-  settings(scalaVersion := scalaV).
-  jsConfigure(_ enablePlugins ScalaJSWeb)
-
-lazy val sharedJvm = shared.jvm
-lazy val sharedJs = shared.js*/
-
+).enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin, ScalablyTypedConverterPlugin)
 
 name := "zbdb-stats"
 

project/plugins.sbt

@@ -1,12 +1,6 @@
 // Comment to get more information during initialization
 logLevel := Level.Warn
 
-// Resolvers
-resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
-
-resolvers += Resolver.url("heroku-sbt-plugin-releases",
-  url("https://dl.bintray.com/heroku/sbt-plugins/"))(Resolver.ivyStylePatterns)
-
 // Sbt plugins
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.20")