Skip to content

Commit

Permalink
Merge pull request #219 from eed3si9n/wip/M3
Browse files Browse the repository at this point in the history
Cross build to sbt 2.0.0-M3
  • Loading branch information
eed3si9n authored Dec 19, 2024
2 parents 1a1ec7c + ac9a3a7 commit 896327a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ jobs:
- name: Scala 3
if: ${{ matrix.jobtype == 3 }}
shell: bash
run: sbt -v '++ 3.3.4!' library/test scripted
run: sbt -v '++ 3.x' library/test scripted
5 changes: 0 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,12 @@ jobs:
java-version: 8
cache: sbt
- uses: sbt/setup-sbt@v1
- name: Test
run: |
gpg --import test-key.gpg
sbt +test +packagedArtifacts
- name: Release
env:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
CI_CLEAN: clean
CI_RELEASE: +publishSigned
run: |
sbt ci-release
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ThisBuild / Compile / scalacOptions := Seq("-feature", "-deprecation", "-Xlint")
// Because we're both a library and an sbt plugin, we use crossScalaVersions rather than crossSbtVersions for
// cross building. So you can use commands like +scripted.
lazy val scala212 = "2.12.15"
lazy val scala3 = "3.3.4"
lazy val scala3 = "3.6.2"
ThisBuild / crossScalaVersions := Seq(scala212, scala3)
ThisBuild / scalaVersion := scala212

Expand Down Expand Up @@ -48,7 +48,7 @@ lazy val plugin = (project in file("sbt-pgp"))
(pluginCrossBuild / sbtVersion) := {
scalaBinaryVersion.value match {
case "2.12" => "1.5.8"
case _ => "2.0.0-M2"
case _ => "2.0.0-M3"
}
},
scriptedSbt := {
Expand Down
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.1")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
evictionErrorLevel := Level.Info
addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")

0 comments on commit 896327a

Please sign in to comment.