Skip to content

Commit 1c0fc24

Browse files
authored
Update build.sbt to cover crossScalaVersion (#74)
* fix bundle * rename * update version * remove * move * add back scripted * update * remove * fix * fix * fix * fix * update * udate * fix * fix * 2.13.16 * update * update * update * only release scala 2.x
1 parent 78d92ad commit 1c0fc24

File tree

2 files changed

+38
-27
lines changed

2 files changed

+38
-27
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Release
22
on:
3+
pull_request:
34
push:
45
branches: [master, main]
56
tags: ["**"]

build.sbt

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,37 @@ This gives you the ability to generate client SDKs, documentation, new generator
77
specifications as part of your build. Other tasks are available as command line tasks.
88
"""
99

10-
lazy val scala212 = "2.12.20"
11-
lazy val scala3 = "3.7.2"
12-
13-
inThisBuild(
14-
List(
15-
homepage := Some(url("https://openapi-generator.tech")),
16-
17-
organization := "org.openapitools",
18-
organizationName := "OpenAPI-Generator Contributors",
19-
organizationHomepage := Some(url("https://github.com/OpenAPITools")),
20-
21-
licenses += ("The Apache Software License, Version 2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt")),
22-
23-
developers += Developer(
24-
id = "openapitools",
25-
name = "OpenAPI-Generator Contributors",
26-
email = "team@openapitools.org",
27-
url = url("https://github.com/OpenAPITools")
28-
)
29-
)
30-
)
10+
lazy val scala21220 = "2.12.20"
11+
lazy val scala372 = "3.7.2"
3112

3213
onLoadMessage := s"Welcome to sbt-openapi-generator ${version.value}"
33-
crossScalaVersions := Nil
14+
//crossScalaVersions := Nil
3415
//publish / skip := true // don't publish the root project
3516

36-
lazy val plugin = (project in file("."))
37-
.enablePlugins(SbtPlugin)
17+
lazy val `sbt-openapi-generator` = (project in file("."))
3818
.settings(
19+
inThisBuild(
20+
List(
21+
homepage := Some(url("https://openapi-generator.tech")),
22+
23+
organization := "org.openapitools",
24+
organizationName := "OpenAPI-Generator Contributors",
25+
organizationHomepage := Some(url("https://github.com/OpenAPITools")),
26+
27+
licenses += ("The Apache Software License, Version 2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt")),
28+
29+
developers += Developer(
30+
id = "openapitools",
31+
name = "OpenAPI-Generator Contributors",
32+
email = "team@openapitools.org",
33+
url = url("https://github.com/OpenAPITools")
34+
)
35+
)
36+
),
3937
moduleName := "sbt-openapi-generator",
40-
crossScalaVersions := Seq(scala212, scala3),
38+
crossScalaVersions := Seq(scala21220),
39+
//crossScalaVersions := Seq(scala21220, scala372),
40+
sbtPlugin := true,
4141
scalacOptions ++= {
4242
scalaBinaryVersion.value match {
4343
case "2.12" => "-Xsource:3" :: Nil
@@ -50,6 +50,16 @@ lazy val plugin = (project in file("."))
5050
case _ => "2.0.0-RC3"
5151
}
5252
},
53+
scriptedLaunchOpts := {
54+
scriptedLaunchOpts.value ++ Seq("-Xmx1024M", "-server", "-Dplugin.version=" + version.value)
55+
},
56+
57+
scriptedBufferLog := false,
58+
59+
resolvers ++= Seq(
60+
Resolver.sbtPluginRepo("snapshots"),
61+
),
62+
63+
5364
libraryDependencies += "org.openapitools" % "openapi-generator" % "7.14.0",
54-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
55-
)
65+
).enablePlugins(SbtPlugin)

0 commit comments

Comments
 (0)