Skip to content

Commit 699e23c

Browse files
committed
build: cross-publish plugin for sbt 1 and sbt 2
1 parent 7a50e4e commit 699e23c

4 files changed

Lines changed: 14 additions & 16 deletions

File tree

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ jobs:
77
publish:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v6
1111
with:
1212
fetch-depth: 0
13-
- uses: actions/setup-java@v4
13+
- uses: actions/setup-java@v5
1414
with:
1515
distribution: temurin
16-
java-version: 8
16+
java-version: 17
1717
cache: sbt
1818
- uses: sbt/setup-sbt@v1
1919
- run: sbt ci-release

.github/workflows/sbt.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v6
1212
with:
1313
fetch-depth: 0
1414
- name: Set up JDK
15-
uses: actions/setup-java@v4
15+
uses: actions/setup-java@v5
1616
with:
17-
java-version: 11
17+
java-version: 17
1818
distribution: temurin
1919
- name: Setup sbt launcher
2020
uses: sbt/setup-sbt@v1
@@ -29,5 +29,4 @@ jobs:
2929
path: ~/.sbt
3030
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt') }}
3131
- name: Build
32-
run: sbt compile
33-
#run: sbt ^test ^scripted
32+
run: sbt +test +scripted

build.sbt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ specifications as part of your build. Other tasks are available as command line
88
"""
99

1010
lazy val scala21220 = "2.12.20"
11-
lazy val scala372 = "3.7.2"
11+
lazy val scala384 = "3.8.4"
1212

1313
onLoadMessage := s"Welcome to sbt-openapi-generator ${version.value}"
1414
//crossScalaVersions := Nil
@@ -38,19 +38,18 @@ lazy val `sbt-openapi-generator` = (project in file("."))
3838
)
3939
),
4040
moduleName := "sbt-openapi-generator",
41-
crossScalaVersions := Seq(scala21220),
42-
// crossScalaVersions := Seq(scala21220, scala372),
41+
crossScalaVersions := Seq(scala21220, scala384),
4342
sbtPlugin := true,
4443
scalacOptions ++= {
4544
scalaBinaryVersion.value match {
46-
case "2.12" => "-Xsource:3" :: Nil
47-
case _ => Nil
45+
case "2.12" => Seq("-Xsource:3", "-release:11")
46+
case _ => Seq("-release:17")
4847
}
4948
},
5049
(pluginCrossBuild / sbtVersion) := {
5150
scalaBinaryVersion.value match {
52-
case "2.12" => "1.12.10"
53-
case _ => "2.0.0-RC12"
51+
case "2.12" => "1.12.11"
52+
case _ => "2.0.0"
5453
}
5554
},
5655
scriptedLaunchOpts := {

project/build.properties

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

0 commit comments

Comments
 (0)