Skip to content

Commit be17f00

Browse files
authored
Hotfix/gpg (#96)
* Setting version to 0.57.0 [ci skip] * Trying to patch GPG * Alignment * Trying to use bouncy castle * Bumping SBT version. Including project URL. * Setting version to 0.58.0-SNAPSHOT
1 parent 0b64dfc commit be17f00

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

build.sbt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import sbtrelease.ReleasePlugin.autoImport.{ReleaseStep, _}
1818
import sbtrelease.ReleaseStateTransformations._
1919
import Publishing.{ciSkipSequence, pgpPass, releaseTutFolder, runningUnderCi}
2020

21+
Global / useGpg := false
22+
2123
lazy val Versions = new {
2224
val scalatest = "3.0.8"
2325
val cats = "1.5.0"
@@ -225,9 +227,9 @@ lazy val parsers = (project in file("util-parsers"))
225227
"org.scalatest" %% "scalatest" % Versions.scalatest % Test
226228
)
227229
).dependsOn(
228-
domain,
229-
samplers % Test
230-
)
230+
domain,
231+
samplers % Test
232+
)
231233

232234
lazy val parsersCats = (project in file("util-parsers-cats"))
233235
.settings(sharedSettings: _*)

project/Publishing.scala

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ object Publishing {
110110
lazy val mavenSettings: Seq[Def.Setting[_]] = Seq(
111111
credentials += Credentials(Path.userHome / ".ivy2" / ".credentials"),
112112
publishConfiguration := publishConfiguration.value.withOverwrite(true),
113+
useGpgAgent := false,
113114
publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(true),
114115
Global / pgpPassphrase := {
115116
if (runningUnderCi && pgpPass.isDefined) {
@@ -142,12 +143,15 @@ object Publishing {
142143
"alexflav23",
143144
"Flavian Alexandru",
144145
145-
url("https://github.com/alexflav23"))
146+
url("https://github.com/alexflav23")
147+
)
146148
),
147-
licenses += ("Apache-2.0", url("https://github.com/outworkers/util/blob/develop/LICENSE.txt")),
149+
licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0")),
148150
publishArtifact in Test := false,
149151
publishMavenStyle := true,
150-
pomIncludeRepository := { _ => true }
152+
pomIncludeRepository := { _ => true },
153+
pomExtra := <url>https://github.com/outworkers/util</url>
154+
151155
)
152156

153157
def effectiveSettings: Seq[Def.Setting[_]] = mavenSettings

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.3
1+
sbt.version=1.3.8

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "0.57.0-SNAPSHOT"
1+
version in ThisBuild := "0.58.0-SNAPSHOT"

0 commit comments

Comments
 (0)