From 18d4d1980b83514f6441cead78f311d1d1a8c090 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 25 Aug 2025 20:08:04 +0800 Subject: [PATCH 1/2] Revert "Refactor build.sbt (#71)" This reverts commit d649bdbefb92ef05dd2c6ad39d8dcd095a582724. --- build.sbt | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/build.sbt b/build.sbt index 07058d2..33d45a8 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,14 @@ This gives you the ability to generate client SDKs, documentation, new generator specifications as part of your build. Other tasks are available as command line tasks. """ -inThisBuild(List( +lazy val `sbt-openapi-generator` = (project in file(".")) + .settings( + scalaVersion := "2.12.20", + crossScalaVersions := Seq(scalaVersion.value), + crossSbtVersions := List("1.11.4"), + sbtPlugin := true, + + inThisBuild(List( homepage := Some(url("https://openapi-generator.tech")), organization := "org.openapitools", @@ -22,23 +29,13 @@ inThisBuild(List( email = "team@openapitools.org", url = url("https://github.com/OpenAPITools") ) -)) + )), -crossScalaVersions := Nil + scriptedLaunchOpts := { + scriptedLaunchOpts.value ++ Seq("-Xmx1024M", "-server", "-Dplugin.version=" + version.value) + }, -lazy val `sbt-openapi-generator` = (project in file(".")) - .enablePlugins(SbtPlugin) - .settings( - moduleName := "sbt-openapi-generator", - crossScalaVersions := Seq("2.12.20"), - sbtPlugin := true, - //crossScalaVersions := Seq("2.12.20", "3.7.2"), - //(pluginCrossBuild / sbtVersion) := { - // scalaBinaryVersion.value match { - // case "2.12" => "1.11.4" - // case _ => "2.0.0-RC3" - // } - //}, + scriptedBufferLog := false, resolvers ++= Seq( Resolver.sbtPluginRepo("snapshots"), @@ -46,6 +43,7 @@ lazy val `sbt-openapi-generator` = (project in file(".")) //version := "7.14.0", + scmInfo := Some( ScmInfo( browseUrl = url("https://github.com/OpenAPITools/openapi-generator"), @@ -54,4 +52,4 @@ lazy val `sbt-openapi-generator` = (project in file(".")) ), libraryDependencies += "org.openapitools" % "openapi-generator" % "7.14.0" - ) + ).enablePlugins(SbtPlugin) From d34304072975134e40647c79f8197d973079e310 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 25 Aug 2025 20:09:57 +0800 Subject: [PATCH 2/2] revert, add module name --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 33d45a8..db18716 100644 --- a/build.sbt +++ b/build.sbt @@ -9,6 +9,7 @@ specifications as part of your build. Other tasks are available as command line lazy val `sbt-openapi-generator` = (project in file(".")) .settings( + moduleName := "sbt-openapi-generator", scalaVersion := "2.12.20", crossScalaVersions := Seq(scalaVersion.value), crossSbtVersions := List("1.11.4"),