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

Commit

Permalink
Working on release fix for signing artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
atooni committed Mar 18, 2020
1 parent 10c8f50 commit 67ddc95
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
12 changes: 4 additions & 8 deletions project/ProjectSettings.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import blended.sbt.phoenix.osgi.OsgiConfig
import de.wayofquality.sbt.testlogconfig.TestLogConfig
import de.wayofquality.sbt.testlogconfig.TestLogConfig.autoImport._
import net.bzzt.reproduciblebuilds.ReproducibleBuildsPlugin
//import net.bzzt.reproduciblebuilds.ReproducibleBuildsPlugin
import phoenix.ProjectConfig
import sbt.Keys._
import sbt.Tests.{Group, SubProcess}
Expand Down Expand Up @@ -35,7 +35,7 @@ trait ProjectSettings
}
Project(name, file(projectDir.getOrElse(projectName)))
}

private def hasForkAnnotation(clazz: AnalyzedClass): Boolean = {

val c = clazz.api().classApi()
Expand Down Expand Up @@ -103,16 +103,12 @@ trait ProjectSettings
forked ++ Seq(combined)
},

) ++
// We need to explicitly load the rb settings again to
// make sure the OSGi package is post-processed:
ReproducibleBuildsPlugin.projectSettings

)
}


override def plugins: Seq[AutoPlugin] = super.plugins ++
Seq(ReproducibleBuildsPlugin) ++
//Seq(ReproducibleBuildsPlugin) ++
Seq(TestLogConfig)

}
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.13.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.9")
//addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
// Support for artifact signing with gpg
addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
// Export test coveragt to codacy
addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "2.112")

Expand All @@ -23,7 +23,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.5")
// Scala source code formatter (also used by Scala-IDE/Eclipse)
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")
// Strip artifacts to make them more reproducible (same input -> same output, checksum wise)
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.16")
//addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.16")

// Generate logging config for test execution
addSbtPlugin("de.wayofquality.sbt" % "sbt-testlogconfig" % "0.1.0")
Expand Down

0 comments on commit 67ddc95

Please sign in to comment.