diff --git a/build.sbt b/build.sbt new file mode 100644 index 000000000..ce4ae3f5d --- /dev/null +++ b/build.sbt @@ -0,0 +1,166 @@ +import sbtrelease.ReleasePlugin.ReleaseKeys.{ publishArtifactsAction, versionBump } +import sbtrelease.Version.Bump + +lazy val publishingSettings = Seq( + publishMavenStyle := true, + publishTo := { + val nexus = "https://oss.sonatype.org/" + if (isSnapshot.value) + Some("snapshots" at nexus + "content/repositories/snapshots") + else + Some("releases" at nexus + "service/local/staging/deploy/maven2") + }, + pomExtra := { + https://github.com/alexarchambault/coursier + + + Apache 2.0 + http://opensource.org/licenses/Apache-2.0 + + + + scm:git:github.com/alexarchambault/coursier.git + scm:git:git@github.com:alexarchambault/coursier.git + github.com/alexarchambault/coursier.git + + + + alexarchambault + Alexandre Archambault + https://github.com/alexarchambault + + + }, + credentials += { + Seq("SONATYPE_USER", "SONATYPE_PASS").map(sys.env.get) match { + case Seq(Some(user), Some(pass)) => + Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", user, pass) + case _ => + Credentials(Path.userHome / ".ivy2" / ".credentials") + } + }, + versionBump := Bump.Bugfix, + publishArtifactsAction := PgpKeys.publishSigned.value +) ++ releaseSettings + +lazy val commonSettings = Seq( + organization := "com.github.alexarchambault", + scalaVersion := "2.11.7", + crossScalaVersions := Seq("2.10.5", "2.11.7"), + resolvers ++= Seq( + "Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases", + Resolver.sonatypeRepo("releases") + ) +) + +lazy val core = crossProject + .settings(commonSettings: _*) + .settings(publishingSettings: _*) + .settings( + name := "coursier", + libraryDependencies += "org.scala-lang.modules" %% "scala-async" % "0.9.1" % "provided", + unmanagedResourceDirectories in Compile += (baseDirectory in LocalRootProject).value / "core" / "shared" / "src" / "main" / "resources", + unmanagedResourceDirectories in Test += (baseDirectory in LocalRootProject).value / "core" / "shared" / "src" / "test" / "resources", + testFrameworks += new TestFramework("utest.runner.Framework") + ) + .jvmSettings( + libraryDependencies ++= Seq( + "org.scalaz" %% "scalaz-concurrent" % "7.1.2", + "com.lihaoyi" %% "utest" % "0.3.0" % "test" + ) ++ { + if (scalaVersion.value.startsWith("2.10.")) Seq() + else Seq( + "org.scala-lang.modules" %% "scala-xml" % "1.0.3" + ) + } + ) + .jsSettings( + libraryDependencies ++= Seq( + "org.scala-js" %%% "scalajs-dom" % "0.8.0", + "com.github.japgolly.fork.scalaz" %%% "scalaz-core" % (if (scalaVersion.value.startsWith("2.10.")) "7.1.1" else "7.1.2"), + "be.doeraene" %%% "scalajs-jquery" % "0.8.0", + "com.lihaoyi" %%% "utest" % "0.3.0" % "test" + ), + postLinkJSEnv := NodeJSEnv().value, + scalaJSStage in Global := FastOptStage + ) + +lazy val coreJvm = core.jvm +lazy val coreJs = core.js + +lazy val files = project + .dependsOn(coreJvm) + .settings(commonSettings) + .settings(publishingSettings) + .settings( + name := "coursier-files", + libraryDependencies ++= Seq( + "com.lihaoyi" %% "utest" % "0.3.0" % "test" + ), + testFrameworks += new TestFramework("utest.runner.Framework") + ) + +lazy val cli = project + .dependsOn(coreJvm, files) + .settings(commonSettings) + .settings(publishingSettings) + .settings(packAutoSettings ++ publishPackTxzArchive ++ publishPackZipArchive) + .settings( + packArchivePrefix := s"coursier-cli_${scalaBinaryVersion.value}", + packArchiveTxzArtifact := Artifact("coursier-cli", "arch", "tar.xz"), + packArchiveZipArtifact := Artifact("coursier-cli", "arch", "zip") + ) + .settings( + name := "coursier-cli", + libraryDependencies ++= Seq( + "com.github.alexarchambault" %% "case-app" % "0.3.0", + "ch.qos.logback" % "logback-classic" % "1.1.3" + ) ++ { + if (scalaVersion.value startsWith "2.10.") + Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full)) + else + Seq() + } + ) + +lazy val web = project + .enablePlugins(ScalaJSPlugin) + .dependsOn(coreJs) + .settings(commonSettings) + .settings( + libraryDependencies ++= { + if (scalaVersion.value startsWith "2.10.") + Seq() + else + Seq("com.github.japgolly.scalajs-react" %%% "core" % "0.9.0") + }, + sourceDirectory := { + val dir = sourceDirectory.value + + if (scalaVersion.value startsWith "2.10.") + dir / "dummy" + else + dir + }, + publish := (), + publishLocal := (), + test in Test := (), + testOnly in Test := (), + resolvers += "Webjars Bintray" at "https://dl.bintray.com/webjars/maven/", + jsDependencies ++= Seq( + ("org.webjars.bower" % "bootstrap" % "3.3.4" intransitive()) / "bootstrap.min.js" commonJSName "Bootstrap", + ("org.webjars.bower" % "react" % "0.12.2" intransitive()) / "react-with-addons.js" commonJSName "React", + ("org.webjars.bower" % "bootstrap-treeview" % "1.2.0" intransitive()) / "bootstrap-treeview.min.js" commonJSName "Treeview", + ("org.webjars.bower" % "raphael" % "2.1.4" intransitive()) / "raphael-min.js" commonJSName "Raphael" + ) + ) + +lazy val `coursier` = project.in(file(".")) + .aggregate(coreJvm, coreJs, files, cli, web) + .settings(commonSettings) + .settings( + (unmanagedSourceDirectories in Compile) := Nil, + (unmanagedSourceDirectories in Test) := Nil, + publish := (), + publishLocal := () + ) diff --git a/core-js/src/main/scala/coursier/core/MavenRepository.scala b/core/js/src/main/scala/coursier/core/MavenRepository.scala similarity index 100% rename from core-js/src/main/scala/coursier/core/MavenRepository.scala rename to core/js/src/main/scala/coursier/core/MavenRepository.scala diff --git a/core-js/src/main/scala/coursier/core/compatibility/package.scala b/core/js/src/main/scala/coursier/core/compatibility/package.scala similarity index 100% rename from core-js/src/main/scala/coursier/core/compatibility/package.scala rename to core/js/src/main/scala/coursier/core/compatibility/package.scala diff --git a/core-js/src/main/scala/scalaz/concurrent/package.scala b/core/js/src/main/scala/scalaz/concurrent/package.scala similarity index 100% rename from core-js/src/main/scala/scalaz/concurrent/package.scala rename to core/js/src/main/scala/scalaz/concurrent/package.scala diff --git a/core-js/src/test/scala/coursier/test/JsTests.scala b/core/js/src/test/scala/coursier/test/JsTests.scala similarity index 100% rename from core-js/src/test/scala/coursier/test/JsTests.scala rename to core/js/src/test/scala/coursier/test/JsTests.scala diff --git a/core-js/src/test/scala/coursier/test/compatibility/package.scala b/core/js/src/test/scala/coursier/test/compatibility/package.scala similarity index 100% rename from core-js/src/test/scala/coursier/test/compatibility/package.scala rename to core/js/src/test/scala/coursier/test/compatibility/package.scala diff --git a/core-jvm/src/main/scala/coursier/core/MavenRepository.scala b/core/jvm/src/main/scala/coursier/core/MavenRepository.scala similarity index 100% rename from core-jvm/src/main/scala/coursier/core/MavenRepository.scala rename to core/jvm/src/main/scala/coursier/core/MavenRepository.scala diff --git a/core-jvm/src/main/scala/coursier/core/compatibility/package.scala b/core/jvm/src/main/scala/coursier/core/compatibility/package.scala similarity index 100% rename from core-jvm/src/main/scala/coursier/core/compatibility/package.scala rename to core/jvm/src/main/scala/coursier/core/compatibility/package.scala diff --git a/core-jvm/src/test/scala/coursier/test/IvyLocalTests.scala b/core/jvm/src/test/scala/coursier/test/IvyLocalTests.scala similarity index 100% rename from core-jvm/src/test/scala/coursier/test/IvyLocalTests.scala rename to core/jvm/src/test/scala/coursier/test/IvyLocalTests.scala diff --git a/core-jvm/src/test/scala/coursier/test/compatibility/package.scala b/core/jvm/src/test/scala/coursier/test/compatibility/package.scala similarity index 100% rename from core-jvm/src/test/scala/coursier/test/compatibility/package.scala rename to core/jvm/src/test/scala/coursier/test/compatibility/package.scala diff --git a/core/src/main/scala/coursier/core/Definitions.scala b/core/shared/src/main/scala/coursier/core/Definitions.scala similarity index 100% rename from core/src/main/scala/coursier/core/Definitions.scala rename to core/shared/src/main/scala/coursier/core/Definitions.scala diff --git a/core/src/main/scala/coursier/core/Exclusions.scala b/core/shared/src/main/scala/coursier/core/Exclusions.scala similarity index 100% rename from core/src/main/scala/coursier/core/Exclusions.scala rename to core/shared/src/main/scala/coursier/core/Exclusions.scala diff --git a/core/src/main/scala/coursier/core/Orders.scala b/core/shared/src/main/scala/coursier/core/Orders.scala similarity index 100% rename from core/src/main/scala/coursier/core/Orders.scala rename to core/shared/src/main/scala/coursier/core/Orders.scala diff --git a/core/src/main/scala/coursier/core/Parse.scala b/core/shared/src/main/scala/coursier/core/Parse.scala similarity index 100% rename from core/src/main/scala/coursier/core/Parse.scala rename to core/shared/src/main/scala/coursier/core/Parse.scala diff --git a/core/src/main/scala/coursier/core/Repository.scala b/core/shared/src/main/scala/coursier/core/Repository.scala similarity index 100% rename from core/src/main/scala/coursier/core/Repository.scala rename to core/shared/src/main/scala/coursier/core/Repository.scala diff --git a/core/src/main/scala/coursier/core/Resolution.scala b/core/shared/src/main/scala/coursier/core/Resolution.scala similarity index 100% rename from core/src/main/scala/coursier/core/Resolution.scala rename to core/shared/src/main/scala/coursier/core/Resolution.scala diff --git a/core/src/main/scala/coursier/core/ResolutionProcess.scala b/core/shared/src/main/scala/coursier/core/ResolutionProcess.scala similarity index 100% rename from core/src/main/scala/coursier/core/ResolutionProcess.scala rename to core/shared/src/main/scala/coursier/core/ResolutionProcess.scala diff --git a/core/src/main/scala/coursier/core/Version.scala b/core/shared/src/main/scala/coursier/core/Version.scala similarity index 100% rename from core/src/main/scala/coursier/core/Version.scala rename to core/shared/src/main/scala/coursier/core/Version.scala diff --git a/core/src/main/scala/coursier/core/Versions.scala b/core/shared/src/main/scala/coursier/core/Versions.scala similarity index 100% rename from core/src/main/scala/coursier/core/Versions.scala rename to core/shared/src/main/scala/coursier/core/Versions.scala diff --git a/core/src/main/scala/coursier/core/Xml.scala b/core/shared/src/main/scala/coursier/core/Xml.scala similarity index 100% rename from core/src/main/scala/coursier/core/Xml.scala rename to core/shared/src/main/scala/coursier/core/Xml.scala diff --git a/core/src/main/scala/coursier/package.scala b/core/shared/src/main/scala/coursier/package.scala similarity index 100% rename from core/src/main/scala/coursier/package.scala rename to core/shared/src/main/scala/coursier/package.scala diff --git a/core/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0 b/core/shared/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0 similarity index 100% rename from core/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0 rename to core/shared/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0 diff --git a/core/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0.jcabi b/core/shared/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0.jcabi similarity index 100% rename from core/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0.jcabi rename to core/shared/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0.jcabi diff --git a/core/src/test/resources/resolutions/com.github.alexarchambault/coursier_2.11/0.1.0-SNAPSHOT b/core/shared/src/test/resources/resolutions/com.github.alexarchambault/coursier_2.11/0.1.0-SNAPSHOT similarity index 100% rename from core/src/test/resources/resolutions/com.github.alexarchambault/coursier_2.11/0.1.0-SNAPSHOT rename to core/shared/src/test/resources/resolutions/com.github.alexarchambault/coursier_2.11/0.1.0-SNAPSHOT diff --git a/core/src/test/resources/resolutions/com.github.fommil/java-logging/1.2-SNAPSHOT b/core/shared/src/test/resources/resolutions/com.github.fommil/java-logging/1.2-SNAPSHOT similarity index 100% rename from core/src/test/resources/resolutions/com.github.fommil/java-logging/1.2-SNAPSHOT rename to core/shared/src/test/resources/resolutions/com.github.fommil/java-logging/1.2-SNAPSHOT diff --git a/core/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1 b/core/shared/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1 similarity index 100% rename from core/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1 rename to core/shared/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1 diff --git a/core/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1.jcabi b/core/shared/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1.jcabi similarity index 100% rename from core/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1.jcabi rename to core/shared/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1.jcabi diff --git a/core/src/test/scala/coursier/test/CentralTests.scala b/core/shared/src/test/scala/coursier/test/CentralTests.scala similarity index 100% rename from core/src/test/scala/coursier/test/CentralTests.scala rename to core/shared/src/test/scala/coursier/test/CentralTests.scala diff --git a/core/src/test/scala/coursier/test/ExclusionsTests.scala b/core/shared/src/test/scala/coursier/test/ExclusionsTests.scala similarity index 100% rename from core/src/test/scala/coursier/test/ExclusionsTests.scala rename to core/shared/src/test/scala/coursier/test/ExclusionsTests.scala diff --git a/core/src/test/scala/coursier/test/PomParsingTests.scala b/core/shared/src/test/scala/coursier/test/PomParsingTests.scala similarity index 100% rename from core/src/test/scala/coursier/test/PomParsingTests.scala rename to core/shared/src/test/scala/coursier/test/PomParsingTests.scala diff --git a/core/src/test/scala/coursier/test/ResolutionTests.scala b/core/shared/src/test/scala/coursier/test/ResolutionTests.scala similarity index 100% rename from core/src/test/scala/coursier/test/ResolutionTests.scala rename to core/shared/src/test/scala/coursier/test/ResolutionTests.scala diff --git a/core/src/test/scala/coursier/test/TestRepository.scala b/core/shared/src/test/scala/coursier/test/TestRepository.scala similarity index 100% rename from core/src/test/scala/coursier/test/TestRepository.scala rename to core/shared/src/test/scala/coursier/test/TestRepository.scala diff --git a/core/src/test/scala/coursier/test/VersionConstraintTests.scala b/core/shared/src/test/scala/coursier/test/VersionConstraintTests.scala similarity index 100% rename from core/src/test/scala/coursier/test/VersionConstraintTests.scala rename to core/shared/src/test/scala/coursier/test/VersionConstraintTests.scala diff --git a/core/src/test/scala/coursier/test/VersionIntervalTests.scala b/core/shared/src/test/scala/coursier/test/VersionIntervalTests.scala similarity index 100% rename from core/src/test/scala/coursier/test/VersionIntervalTests.scala rename to core/shared/src/test/scala/coursier/test/VersionIntervalTests.scala diff --git a/core/src/test/scala/coursier/test/VersionTests.scala b/core/shared/src/test/scala/coursier/test/VersionTests.scala similarity index 100% rename from core/src/test/scala/coursier/test/VersionTests.scala rename to core/shared/src/test/scala/coursier/test/VersionTests.scala diff --git a/core/src/test/scala/coursier/test/package.scala b/core/shared/src/test/scala/coursier/test/package.scala similarity index 100% rename from core/src/test/scala/coursier/test/package.scala rename to core/shared/src/test/scala/coursier/test/package.scala diff --git a/project/Coursier.scala b/project/Coursier.scala deleted file mode 100644 index 80a4f8dd6..000000000 --- a/project/Coursier.scala +++ /dev/null @@ -1,183 +0,0 @@ -import org.scalajs.sbtplugin.ScalaJSPlugin -import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ - -import sbt._, Keys._ - -import sbtrelease.ReleasePlugin.releaseSettings -import sbtrelease.ReleasePlugin.ReleaseKeys.{ publishArtifactsAction, versionBump } -import sbtrelease.Version.Bump -import com.typesafe.sbt.pgp.PgpKeys - -import xerial.sbt.Pack._ - - -object CoursierBuild extends Build { - - lazy val publishingSettings = Seq[Setting[_]]( - publishMavenStyle := true, - publishTo := { - val nexus = "https://oss.sonatype.org/" - if (isSnapshot.value) - Some("snapshots" at nexus + "content/repositories/snapshots") - else - Some("releases" at nexus + "service/local/staging/deploy/maven2") - }, - pomExtra := { - https://github.com/alexarchambault/coursier - - - Apache 2.0 - http://opensource.org/licenses/Apache-2.0 - - - - scm:git:github.com/alexarchambault/coursier.git - scm:git:git@github.com:alexarchambault/coursier.git - github.com/alexarchambault/coursier.git - - - - alexarchambault - Alexandre Archambault - https://github.com/alexarchambault - - - }, - credentials += { - Seq("SONATYPE_USER", "SONATYPE_PASS").map(sys.env.get) match { - case Seq(Some(user), Some(pass)) => - Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", user, pass) - case _ => - Credentials(Path.userHome / ".ivy2" / ".credentials") - } - }, - versionBump := Bump.Bugfix, - publishArtifactsAction := PgpKeys.publishSigned.value - ) ++ releaseSettings - - lazy val commonSettings = Seq[Setting[_]]( - organization := "com.github.alexarchambault", - scalaVersion := "2.11.7", - crossScalaVersions := Seq("2.10.5", "2.11.7"), - resolvers ++= Seq( - "Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases", - Resolver.sonatypeRepo("releases") - ) - ) ++ publishingSettings - - private lazy val commonCoreSettings = commonSettings ++ Seq[Setting[_]]( - name := "coursier", - libraryDependencies += "org.scala-lang.modules" %% "scala-async" % "0.9.1" % "provided", - unmanagedSourceDirectories in Compile += (baseDirectory in LocalRootProject).value / "core" / "src" / "main" / "scala", - unmanagedSourceDirectories in Test += (baseDirectory in LocalRootProject).value / "core" / "src" / "test" / "scala", - unmanagedResourceDirectories in Compile += (baseDirectory in LocalRootProject).value / "core" / "src" / "main" / "resources", - unmanagedResourceDirectories in Test += (baseDirectory in LocalRootProject).value / "core" / "src" / "test" / "resources", - testFrameworks += new TestFramework("utest.runner.Framework") - ) - - lazy val coreJvm = Project(id = "core-jvm", base = file("core-jvm")) - .settings(commonCoreSettings: _*) - .settings( - libraryDependencies ++= Seq( - "org.scalaz" %% "scalaz-concurrent" % "7.1.2", - "com.lihaoyi" %% "utest" % "0.3.0" % "test" - ) ++ { - if (scalaVersion.value.startsWith("2.10.")) Seq() - else Seq( - "org.scala-lang.modules" %% "scala-xml" % "1.0.3" - ) - } - ) - - lazy val coreJs = Project(id = "core-js", base = file("core-js")) - .settings(commonCoreSettings: _*) - .settings( - libraryDependencies ++= Seq( - "org.scala-js" %%% "scalajs-dom" % "0.8.0", - "com.github.japgolly.fork.scalaz" %%% "scalaz-core" % (if (scalaVersion.value.startsWith("2.10.")) "7.1.1" else "7.1.2"), - "be.doeraene" %%% "scalajs-jquery" % "0.8.0", - "com.lihaoyi" %%% "utest" % "0.3.0" % "test" - ), - postLinkJSEnv := NodeJSEnv().value, - scalaJSStage in Global := FastOptStage - ) - .enablePlugins(ScalaJSPlugin) - - lazy val files = Project(id = "files", base = file("files")) - .dependsOn(coreJvm) - .settings(commonSettings: _*) - .settings( - name := "coursier-files", - libraryDependencies ++= Seq( - // "org.http4s" %% "http4s-blazeclient" % "0.8.2", - "com.lihaoyi" %% "utest" % "0.3.0" % "test" - ), - testFrameworks += new TestFramework("utest.runner.Framework") - ) - - lazy val cli = Project(id = "cli", base = file("cli")) - .dependsOn(coreJvm, files) - .settings(commonSettings ++ packAutoSettings ++ publishPackTxzArchive ++ publishPackZipArchive: _*) - .settings( - packArchivePrefix := s"coursier-cli_${scalaBinaryVersion.value}", - packArchiveTxzArtifact := Artifact("coursier-cli", "arch", "tar.xz"), - packArchiveZipArtifact := Artifact("coursier-cli", "arch", "zip") - ) - .settings( - name := "coursier-cli", - libraryDependencies ++= Seq( - "com.github.alexarchambault" %% "case-app" % "0.3.0", - "ch.qos.logback" % "logback-classic" % "1.1.3" - ) ++ { - if (scalaVersion.value startsWith "2.10.") - Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full)) - else - Seq() - } - ) - - lazy val web = Project(id = "web", base = file("web")) - .dependsOn(coreJs) - .settings(commonSettings: _*) - .settings( - libraryDependencies ++= { - if (scalaVersion.value startsWith "2.10.") - Seq() - else - Seq( - "com.github.japgolly.scalajs-react" %%% "core" % "0.9.0" - ) - }, - sourceDirectory := { - val dir = sourceDirectory.value - - if (scalaVersion.value startsWith "2.10.") - dir / "dummy" - else - dir - }, - publish := (), - publishLocal := (), - test in Test := (), - testOnly in Test := (), - resolvers += "Webjars Bintray" at "https://dl.bintray.com/webjars/maven/", - jsDependencies ++= Seq( - ("org.webjars.bower" % "bootstrap" % "3.3.4" intransitive()) / "bootstrap.min.js" commonJSName "Bootstrap", - ("org.webjars.bower" % "react" % "0.12.2" intransitive()) / "react-with-addons.js" commonJSName "React", - ("org.webjars.bower" % "bootstrap-treeview" % "1.2.0" intransitive()) / "bootstrap-treeview.min.js" commonJSName "Treeview", - ("org.webjars.bower" % "raphael" % "2.1.4" intransitive()) / "raphael-min.js" commonJSName "Raphael" - ) - ) - .enablePlugins(ScalaJSPlugin) - - lazy val root = Project(id = "root", base = file(".")) - .aggregate(coreJvm, coreJs, files, cli, web) - .settings(commonSettings: _*) - .settings( - (unmanagedSourceDirectories in Compile) := Nil, - (unmanagedSourceDirectories in Test) := Nil, - publish := (), - publishLocal := () - ) - -} diff --git a/project/plugins.sbt b/project/plugins.sbt index dcd3228a0..d26d5c6bc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,5 @@ addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.6.8") - -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.4") - +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.5") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") - addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5") - addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.1.0")