Skip to content

Commit

Permalink
upgrade SBT, plugins and Scala versions
Browse files Browse the repository at this point in the history
  • Loading branch information
mr-git committed Feb 27, 2020
1 parent 13cac91 commit fb23243
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sudo: false
language: scala
jdk:
- oraclejdk8
- openjdk8
# - openjdk11
scala:
- 2.10.6
- 2.11.11
- 2.12.2
- 2.13.1
21 changes: 13 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ rhPackage := {
IO.copyFile(new File(resourcesDirectory, resource), new File(subdirectories("conf"), resource))
}
val iterationId = try { sys.env("GO_PIPELINE_COUNTER") } catch { case e: NoSuchElementException => "DEV" }
"fpm -f -s dir -t rpm --package %s -n pillar --version %s --iteration %s -a all --prefix /opt/pillar -C %s/staged-package/ .".format(target.value.getPath, version.value, iterationId, target.value.getPath).!
"fpm -f -s dir -t rpm --package %s -n pillar --version %s --iteration %s -a all --prefix /opt/pillar -C %s/staged-package/ .".format(target.value.getPath, version.value, iterationId, target.value.getPath)//.!

val pkg = file("%s/pillar-%s-%s.noarch.rpm".format(target.value.getPath, version.value, iterationId))
if(!pkg.exists()) throw new RuntimeException("Packaging failed. Check logs for fpm output.")
Expand All @@ -60,11 +60,16 @@ val dependencies = Seq(
"ch.qos.logback" % "logback-classic" % "1.2.3" % "test"
)

lazy val root = Project(
id = "pillar",
base = file("."),
settings = Defaults.coreDefaultSettings ++ Sonatype.sonatypeSettings
).settings(
lazy val root = project
.in(file("."))
.settings(name := "pillar")
.settings(Defaults.coreDefaultSettings ++ Sonatype.sonatypeSettings)
//lazy val root = Project(
// id = "pillar",
// base = file("."),
// settings = Defaults.coreDefaultSettings ++ Sonatype.sonatypeSettings
//)
.settings(
assemblyTestSetting,
libraryDependencies ++= dependencies,
name := "pillar",
Expand All @@ -73,8 +78,8 @@ lazy val root = Project(
homepage := Some(url("https://github.com/Galeria-Kaufhof/pillar")),
licenses := Seq("MIT license" -> url(
"http://www.opensource.org/licenses/mit-license.php")),
scalaVersion := "2.12.2",
crossScalaVersions := Seq("2.12.2", "2.11.11", "2.10.6")
scalaVersion := "2.12.10",
crossScalaVersions := Seq("2.12.10", "2.13.1")
)
.settings(
publishTo := {
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.15
sbt.version=1.3.8
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")

0 comments on commit fb23243

Please sign in to comment.