Update dependencies and related refactoring

Author: EnverOsmanov

build.sbt

@@ -1,56 +1,54 @@
-import chrome.Impl._
-import chrome.permissions.APIPermission._
+import Dependencies.{addLibraries, addJsLibraries}
+import chrome.permissions.Permission
+import chrome.permissions.Permission.API
+import chrome.{App, AppManifest, Background}
 import net.lullabyte.{Chrome, ChromeSbtPlugin}
 
-lazy val root = project.in(file("."))
-  .enablePlugins(ChromeSbtPlugin)
-  .settings(
-    name := "System Monitor",
-    version := "0.1.0",
-    scalaVersion := "2.11.8",
-    scalacOptions ++= Seq(
-      "-language:implicitConversions",
-      "-language:existentials",
-      "-Xlint",
-      "-deprecation",
-      "-Xfatal-warnings",
-      "-feature"
-    ),
-    persistLauncher := true,
-    persistLauncher in Test := false,
-    relativeSourceMaps := true,
-    libraryDependencies ++= Seq(
-      "org.scala-js" %%% "scalajs-dom" % "0.9.0" withSources() withJavadoc(),
-      "com.github.japgolly.scalajs-react" %%% "core" % "0.9.1" withSources() withJavadoc(),
-      "com.github.japgolly.scalajs-react" %%% "extra" % "0.9.1" withSources() withJavadoc(),
-      "com.github.japgolly.scalacss" %%% "core" % "0.3.0" withSources() withJavadoc(),
-      "com.github.japgolly.scalacss" %%% "ext-react" % "0.3.0" withSources() withJavadoc(),
-      "net.lullabyte" %%% "scala-js-chrome" % "0.2.0" withSources() withJavadoc()
-    ),
-    jsDependencies += "org.webjars" % "react" % "0.13.3" / "react-with-addons.min.js" commonJSName "React",
-    skip in packageJSDependencies := false,
-    chromeManifest := AppManifest(
-      name = name.value,
-      version = version.value,
-      app = App(
-        background = Background(
-          scripts = List("deps.js", "main.js", "launcher.js")
-        )
-      ),
-      defaultLocale = Some("en"),
-      icons = Chrome.icons(
-        "assets/icons",
-        "app.png",
-        Set(16, 32, 48, 64, 96, 128, 256, 512)
-      ),
-      permissions = Set(
-        System.CPU,
-        System.Display,
-        System.Memory,
-        System.Network,
-        Storage
-      )
+enablePlugins(ChromeSbtPlugin)
+
+name          := "System Monitor"
+version       := "0.2.0"
+scalaVersion  := "2.12.2"
+
+
+addLibraries()
+addJsLibraries()
+
+
+scalaJSUseMainModuleInitializer         := true
+scalaJSUseMainModuleInitializer in Test := false
+relativeSourceMaps                      := true
+skip in packageJSDependencies           := false
+
+
+scalacOptions ++= MyBuildConfig.scalacOptions
+
+
+chromeManifest := new AppManifest {
+  val name = Keys.name.value
+  val version = Keys.version.value
+  val app = App(
+    background = Background(
+      scripts = List("dependencies.js", "main.js")
     )
   )
 
+  override val defaultLocale = Some("en")
+
+  override val icons = Chrome.icons(
+    "assets/icons",
+    "app.png",
+    Set(16, 32, 48, 64, 96, 128, 256, 512)
+  )
+
+  override val permissions: Set[Permission] = Set(
+    API.System.CPU,
+    API.System.Display,
+    API.System.Memory,
+    API.System.Network,
+    API.Storage
+  )
+}
+
+
 

project/Dependencies.scala

@@ -0,0 +1,47 @@
+import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
+import sbt.Keys.libraryDependencies
+import sbt._
+
+object Dependencies {
+
+  object versions {
+    val scalacss = "0.5.3"
+    val scalaReact = "1.0.0"
+    val scalaChrome = "0.5.0"
+
+    val react = "15.3.2"
+  }
+
+  def addLibraries() = {
+    libraryDependencies ++= Seq(
+      "org.scala-js"                      %%% "scalajs-dom"     % "0.9.2"               withSources() withJavadoc(),
+      "com.github.japgolly.scalajs-react" %%% "core"            % versions.scalaReact   withSources() withJavadoc(),
+      "com.github.japgolly.scalajs-react" %%% "extra"           % versions.scalaReact   withSources() withJavadoc(),
+      "com.github.japgolly.scalacss"      %%% "core"            % versions.scalacss     withSources() withJavadoc(),
+      "com.github.japgolly.scalacss"      %%% "ext-react"       % versions.scalacss     withSources() withJavadoc(),
+      "net.lullabyte"                     %%% "scala-js-chrome" % versions.scalaChrome  withSources() withJavadoc()
+    )
+  }
+
+  def addJsLibraries() = {
+    jsDependencies ++= Seq(
+      "org.webjars" % "react" % versions.react / "react-with-addons.js" commonJSName "React",
+      "org.webjars" % "react" % versions.react / "react-dom.js"         commonJSName "ReactDOM"
+        dependsOn           "react-with-addons.js"
+        minified            "react-dom.min.js"
+    )
+  }
+}
+
+object MyBuildConfig {
+
+  val scalacOptions = Seq(
+    "-language:implicitConversions",
+    "-language:existentials",
+    "-Xlint",
+    "-deprecation",
+    "-Xfatal-warnings",
+    "-feature"
+  )
+
+}

project/build.properties

@@ -1 +1 @@
-sbt.version = 0.13.8
+sbt.version = 0.13.15

project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("net.lullabyte" % "sbt-chrome-plugin" % "0.2.1")
-addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.6.0")
+addSbtPlugin("net.lullabyte" % "sbt-chrome-plugin" % "0.5.0")
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")