aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlad <vlad@drivergrp.com>2016-09-13 16:40:25 -0700
committervlad <vlad@drivergrp.com>2016-09-13 16:40:25 -0700
commit20eb4fdd6e3ef7a6b9f07172b2df7db88b124937 (patch)
tree0b094e2e97608c5a8c7d4f410a1ef7470e73f7d3
parentb6d17c2a5649b08856f5e6511413cf37d1372031 (diff)
downloadsbt-settings-20eb4fdd6e3ef7a6b9f07172b2df7db88b124937.tar.gz
sbt-settings-20eb4fdd6e3ef7a6b9f07172b2df7db88b124937.tar.bz2
sbt-settings-20eb4fdd6e3ef7a6b9f07172b2df7db88b124937.zip
Turned off Docker in plugin for debug
-rw-r--r--build.sbt4
-rw-r--r--project/plugins.sbt2
-rw-r--r--src/main/scala/com.drivergrp.sbt/SbtSettings.scala46
3 files changed, 26 insertions, 26 deletions
diff --git a/build.sbt b/build.sbt
index cf3bb8c..f0cbd95 100644
--- a/build.sbt
+++ b/build.sbt
@@ -16,10 +16,10 @@ addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.1")
+// addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
-addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.0")
+// addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.0")
// This plugin represents functionality that is to be added to sbt in the future
addSbtPlugin("org.scala-sbt" % "sbt-core-next" % "0.1.1")
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 731b32b..b617004 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -8,7 +8,7 @@ addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.4")
+// addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.4")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
// addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.0")
diff --git a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala
index f49f193..8659457 100644
--- a/src/main/scala/com.drivergrp.sbt/SbtSettings.scala
+++ b/src/main/scala/com.drivergrp.sbt/SbtSettings.scala
@@ -2,12 +2,13 @@ package com.drivergrp.sbt
import sbt.Keys._
import com.typesafe.sbt.SbtGit.git
-import com.typesafe.sbt.SbtNativePackager.Universal
-import com.typesafe.sbt.SbtNativePackager.autoImport._
-import com.typesafe.sbt.packager.SettingsHelper._
-import com.typesafe.sbt.packager.archetypes._
-import com.typesafe.sbt.packager.docker.Cmd
-import com.typesafe.sbt.packager.docker.DockerPlugin.autoImport._
+// import com.typesafe.sbt.SbtNativePackager.Universal
+// import com.typesafe.sbt.SbtNativePackager.autoImport._
+// import com.typesafe.sbt.packager.SettingsHelper._
+// import com.typesafe.sbt.packager.archetypes._
+// import com.typesafe.sbt.packager.docker.Cmd
+// import com.typesafe.sbt.packager.docker.DockerPlugin.autoImport._
+// import sbtdocker.DockerPlugin
import com.typesafe.sbt.{GitBranchPrompt, GitVersioning}
import org.scalafmt.sbt.ScalaFmtPlugin.autoImport._
import org.scalastyle.sbt.ScalastylePlugin._
@@ -16,7 +17,6 @@ import sbtassembly.AssemblyKeys._
import sbtassembly._
import sbtbuildinfo.BuildInfoPlugin
import sbtbuildinfo.BuildInfoPlugin.autoImport.{BuildInfoKey, BuildInfoOption, _}
-import sbtdocker.DockerPlugin
import sbtrelease.{Version, _}
import wartremover.WartRemover.autoImport._
// we hide the existing definition for setReleaseVersion to replace it with our own
@@ -303,10 +303,10 @@ object SbtSettings extends AutoPlugin {
def packagingConfiguration: Project = {
project
- .enablePlugins(JavaAppPackaging)
- .settings(// for sbt-native-packager
- makeDeploymentSettings(Universal, packageBin in Universal, "zip")
- )
+ // .enablePlugins(JavaAppPackaging)
+ // .settings(// for sbt-native-packager
+ // makeDeploymentSettings(Universal, packageBin in Universal, "zip")
+ // )
.settings(// for assembly plugin
test in assembly := {},
assemblyMergeStrategy in assembly := {
@@ -318,20 +318,20 @@ object SbtSettings extends AutoPlugin {
})
}
- def dockerConfiguration: Project = {
- project
- .enablePlugins(DockerPlugin)
- .settings(
- maintainer := "Direct Inc. <info@driver.xyz>",
- dockerBaseImage := "java:openjdk-8-jre-alpine",
- dockerCommands := dockerCommands.value.flatMap { // @see http://blog.codacy.com/2015/07/16/dockerizing-scala/
- case cmd@Cmd("FROM", _) => List(cmd, Cmd("RUN", "apk update && apk add bash"))
- case other => List(other)
- }
- )
+// def dockerConfiguration: Project = {
+// project
+// .enablePlugins(DockerPlugin)
+// .settings(
+// maintainer := "Direct Inc. <info@driver.xyz>",
+// dockerBaseImage := "java:openjdk-8-jre-alpine",
+// dockerCommands := dockerCommands.value.flatMap { // @see http://blog.codacy.com/2015/07/16/dockerizing-scala/
+// case cmd@Cmd("FROM", _) => List(cmd, Cmd("RUN", "apk update && apk add bash"))
+// case other => List(other)
+// }
+// )
// And then you can run "sbt docker:publishLocal"
- }
+// }
}
}