Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Commit

Permalink
Clean up sbt
Browse files Browse the repository at this point in the history
- Restore MAINTAINER label for our Docker image
- Remove left over NativePackager code
- Remove references to jdeb and associated workaround
- Remove sbt-in-sbt loading of Coursier (this causes an issue, see sbt/sbt-native-packager#1053 (comment))
- Sync sbt-in-sbt version
  • Loading branch information
Tim Harper committed Sep 24, 2018
1 parent 0f6ff5f commit 0005d07
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 33 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ lazy val `plugin-interface` = (project in file("plugin-interface"))
)

lazy val marathon = (project in file("."))
.enablePlugins(GitBranchPrompt, JavaServerAppPackaging, DockerPlugin, DebianPlugin, RpmPlugin, JDebPackaging,
.enablePlugins(GitBranchPrompt, JavaServerAppPackaging, DockerPlugin,
RamlGeneratorPlugin, BasicLintingPlugin, GitVersioning, TestWithCoveragePlugin)
.dependsOn(`plugin-interface`)
.settings(testSettings : _*)
Expand Down
24 changes: 0 additions & 24 deletions project/NativePackagerSettings.scala

This file was deleted.

4 changes: 0 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ libraryDependencies ++= Seq(
"org.raml" % "raml-parser-2" % "1.0.3",
"com.eed3si9n" %% "treehugger" % "0.4.3",
"org.slf4j" % "slf4j-nop" % "1.7.25",
"org.vafer" % "jdeb" % "1.5" artifacts Artifact("jdeb", "jar", "jar"),
"com.trueaccord.scalapb" %% "compilerplugin" % "0.6.6"
)

Expand All @@ -39,6 +38,3 @@ scalaVersion := {
case "1.0" => "2.12.4"
}
}

// Needed for jdeb dependency of sbt-native-packager
classpathTypes += "maven-plugin"
2 changes: 1 addition & 1 deletion project/project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# ideally synchronized with ../build.properties. Enables sbt-in-sbt
sbt.version=1.0.4
sbt.version=1.1.0
3 changes: 0 additions & 3 deletions project/project/plugins.sbt

This file was deleted.

0 comments on commit 0005d07

Please sign in to comment.