Merge pull request #3 from virtualirfan/master

Update to M2 and another trivial fix.

build.sbt

@@ -1,6 +1,6 @@
 name := "sbt-sri-platform"
 
-//version := "2017.7.0-SNAPSHOT"
+//version := "2017.12.28-SNAPSHOT"
 
 scalaVersion := "2.10.6"
 
@@ -27,7 +27,7 @@ bintrayRepository := "sbt-plugins"
 
 publishArtifact in Test := false
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M1")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M2")
 
 //Test
 libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.0" % Test

project/build.properties

@@ -1,2 +1,2 @@
-sbt.version=0.13.15
+sbt.version=0.13.16
 

project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "1.3.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
+addSbtPlugin("com.dwijnand" % "sbt-dynver" % "2.0.0")
 addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")

src/main/scala/sri/sbt/platform/ConfigBuilder.scala

@@ -1,10 +1,9 @@
 package sri.sbt.platform
 
-import org.scalajs.core.tools.linker.backend.ModuleKind
 import sbt.Keys._
 import sbt._
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
-import org.scalajs.sbtplugin.ScalaJSPluginInternal
+import org.scalajs.sbtplugin.ScalaJSPlugin
 
 object ConfigBuilder {
 
@@ -52,7 +51,7 @@ object ConfigBuilder {
     val entryFile = getEntryFileName(config)
     inConfig(config)(
       Defaults.compileSettings ++
-        ScalaJSPluginInternal.scalaJSCompileSettings ++ Seq(
+        ScalaJSPlugin.compileConfigSettings ++ Seq(
         discoveredMainClasses := (discoveredMainClasses in Compile).value,
         mainClass := (mainClass in Compile).value,
         console := (console in Compile).value,
@@ -62,13 +61,15 @@ object ConfigBuilder {
         artifactPath in fullOptJS := baseDirectory.value / aPath,
         dev := {
           val indexFile = baseDirectory.value / entryFile
+          IO.touch(indexFile, setModified = false)
           val indexContent = IO.read(indexFile)
           (fastOptJS in config).value.data
           val launcher = s"""require("./$aPath");"""
           if (!indexContent.contains(launcher)) IO.append(indexFile, launcher)
         },
         prod := {
           val indexFile = baseDirectory.value / entryFile
+          IO.touch(indexFile, setModified = false)
           val indexContent = IO.read(indexFile)
           (fullOptJS in config).value.data
           val launcher = s"""require("./$aPath");"""

src/main/scala/sri/sbt/platform/SriPlatformPlugin.scala

@@ -1,7 +1,6 @@
 package sri.sbt.platform
 
 import ConfigBuilder._
-import org.scalajs.core.tools.linker.backend.ModuleKind
 import org.scalajs.sbtplugin.ScalaJSPlugin
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 import sbt.Keys.{defaultConfiguration, ivyConfigurations}