Skip to content

Commit 4536fac

Browse files
author
Bijan Chokoufe Nejad
committed
Rely on sbt-ci-release for versioning and publishTo
1 parent 5b5303e commit 4536fac

File tree

4 files changed

+3
-17
lines changed

4 files changed

+3
-17
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ jobs:
2727
unzip -d project/.gnupg keys.zip
2828
mkdir -p ~/.sbt/1.0
2929
echo $SONATYPE_SBT > ~/.sbt/1.0/sonatype.sbt
30-
- name: Setup version in SBT
31-
run: |
32-
VERSION=${GITHUB_REF/refs\/tags\//}
33-
echo $VERSION
34-
sed "s/unstable-SNAPSHOT/${VERSION}/" build.sbt > build.sbt.2
35-
mv build.sbt.2 build.sbt
3630
- name: Test & Release
3731
run: |
3832
VERSION=${GITHUB_REF/refs\/tags\//}

build.sbt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import Dependencies._
22
import ScalaOptions._
33

4-
organization in ThisBuild := "com.enfore"
4+
ThisBuild / organization := "com.enfore"
55
ThisBuild / crossScalaVersions := supportedVersions
6-
version in ThisBuild := "unstable-SNAPSHOT"
76
fork in Test in ThisBuild := true
87

98
lazy val http4s = Seq(http4sCore, http4sDsl, http4sCirce, http4sServer)
@@ -86,13 +85,6 @@ lazy val `sbt-openapi` = (project in file("sbt-openapi"))
8685
lazy val publishSettings = Seq(
8786
crossPaths := true,
8887
autoAPIMappings := true,
89-
publishTo := {
90-
if (isSnapshot.value)
91-
Some(
92-
Opts.resolver.sonatypeSnapshots
93-
)
94-
else Some(Opts.resolver.sonatypeStaging)
95-
},
9688
useGpg := false,
9789
usePgpKeyHex("1EAA6358E4812E9E"),
9890
pgpPublicRing := file(".") / "project" / ".gnupg" / "pubring.gpg",

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2")
1717
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
1818

1919
// Automate relase using environment variables
20-
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.0")
20+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")

0 commit comments

Comments
 (0)