Skip to content

Commit 3705053

Browse files
authored
Merge pull request #195 from eed3si9n/wip/bump
Switch to Central Portal publishing
2 parents 68d6d36 + 1687272 commit 3705053

File tree

4 files changed

+10
-20
lines changed

4 files changed

+10
-20
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ jobs:
8181
- shell: bash
8282
run: sbt '++ ${{ matrix.scala }}' '+ test' scripted
8383

84+
- name: Clean up Ivy Local repo
85+
shell: bash
86+
run: rm -rf "$HOME/.ivy2/local"
87+
8488
- name: Compress target directories
8589
shell: bash
8690
run: tar cf targets.tar target project/target

build.sbt

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ ThisBuild / scalaVersion := scala212
2323

2424
ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest", "windows-latest")
2525
ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("+ test", "scripted")))
26+
ThisBuild / githubWorkflowBuildPostamble += WorkflowStep.Run(
27+
commands = List("""rm -rf "$HOME/.ivy2/local""""),
28+
name = Some("Clean up Ivy Local repo")
29+
)
2630
ThisBuild / githubWorkflowJavaVersions ++= Seq(
2731
JavaSpec.graalvm(Graalvm.Distribution("graalvm"), "17"),
2832
JavaSpec.corretto("17")
@@ -47,23 +51,6 @@ ThisBuild / githubWorkflowPublish := Seq(
4751
)
4852
)
4953

50-
// So that publishLocal doesn't continuously create new versions
51-
def versionFmt(out: sbtdynver.GitDescribeOutput): String = {
52-
val snapshotSuffix = if
53-
(out.isSnapshot()) "-SNAPSHOT"
54-
else ""
55-
out.ref.dropPrefix + snapshotSuffix
56-
}
57-
58-
def fallbackVersion(d: java.util.Date): String = s"HEAD-${sbtdynver.DynVer timestamp d}"
59-
60-
ThisBuild / version := dynverGitDescribeOutput.value.mkVersion(versionFmt, fallbackVersion(dynverCurrentDate.value))
61-
ThisBuild / dynver := {
62-
val d = new java.util.Date
63-
sbtdynver.DynVer.getGitDescribeOutput(d).mkVersion(versionFmt, fallbackVersion(d))
64-
}
65-
66-
sbtPlugin := true
6754
pluginCrossBuild / sbtVersion := {
6855
scalaBinaryVersion.value match {
6956
case "2.12" =>
@@ -130,6 +117,5 @@ ThisBuild / licenses := List("Apache-2.0" -> url("https://www.apache.org/license
130117
ThisBuild / pomIncludeRepository := { _ =>
131118
false
132119
}
133-
ThisBuild / publishTo := sonatypePublishToBundle.value
134120
ThisBuild / publishMavenStyle := true
135121
Global / excludeLintKeys ++= Set(pomIncludeRepository, publishMavenStyle)

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
// necessary hack to avoid an infinite project loading recursion.
1919
val sbtGithubActionsSources = ProjectRef(file("project"), "sbtGithubActionsSources")
2020

21-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.8.0")
21+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.0")

0 commit comments

Comments
 (0)