Skip to content

Commit

Permalink
Revert "[sbt-gen] sbt plugin for openapi to endpoints codegen (zio#3225
Browse files Browse the repository at this point in the history
…)"

This reverts commit 7381891.
  • Loading branch information
hochgi authored Jan 19, 2025
1 parent 0c11434 commit 53a9643
Show file tree
Hide file tree
Showing 15 changed files with 6 additions and 359 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,6 @@ jobs:
- name: Build project
run: sbt '++ ${{ matrix.scala }}' test

- uses: coursier/setup-action@v1

- name: Test sbt plugin
if: ${{ github.event_name == 'pull_request' }} && matrix.scala == '2.12.19'
run: sbt ++2.12.19 zioHttpGenSbt/scripted

- uses: coursier/setup-action@v1
with:
apps: sbt
Expand All @@ -112,7 +106,7 @@ jobs:
run: sbt '++ ${{ matrix.scala }}' zioHttpShadedTests/test

- name: Compress target directories
run: tar cf targets.tar sbt-zio-http-grpc/target zio-http-gen-sbt-plugin/target zio-http-cli/target target zio-http/jvm/target zio-http-docs/target sbt-zio-http-grpc-tests/target zio-http-gen/target zio-http-benchmarks/target zio-http-tools/target zio-http-example/target zio-http-testkit/target zio-http/js/target zio-http-htmx/target project/target
run: tar cf targets.tar sbt-zio-http-grpc/target zio-http-cli/target target zio-http/jvm/target zio-http-docs/target sbt-zio-http-grpc-tests/target zio-http-gen/target zio-http-benchmarks/target zio-http-tools/target zio-http-example/target zio-http-testkit/target zio-http/js/target zio-http-htmx/target project/target

- name: Upload target directories
uses: actions/upload-artifact@v4
Expand Down
36 changes: 0 additions & 36 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -94,22 +94,6 @@ ThisBuild / githubWorkflowBuildPreamble := Seq(
),
)

ThisBuild / githubWorkflowBuild := {
(ThisBuild / githubWorkflowBuild).value ++ WorkflowJob(
"testSbtPlugin",
"Test sbt plugin",
List(
WorkflowStep.Use(UseRef.Public("coursier", "setup-action", "v1")),
WorkflowStep.Run(
name = Some(s"Test sbt plugin"),
commands = List(s"sbt ++${Scala212} zioHttpGenSbt/scripted"),
cond = Some(s"$${{ github.event_name == 'pull_request' }} && matrix.scala == '$Scala212'"),
),
),
scalas = List(Scala212),
).steps
}

ThisBuild / githubWorkflowBuildPostamble :=
WorkflowJob(
"checkDocGeneration",
Expand Down Expand Up @@ -367,26 +351,6 @@ lazy val zioHttpGen = (project in file("zio-http-gen"))
)
.dependsOn(zioHttpJVM)

lazy val zioHttpGenSbt = (project in file("zio-http-gen-sbt-plugin"))
.enablePlugins(SbtPlugin)
.settings(publishSetting(true))
.settings(
name := "zio-http-sbt-codegen",
sbtPlugin := true,
scalaVersion := Scala212,
semanticdbEnabled := true,
semanticdbVersion := scalafixSemanticdb.revision,
scalacOptions ++= stdOptions ++ extraOptions(scalaVersion.value),
sbtTestDirectory := sourceDirectory.value / "sbt-test",
scriptedLaunchOpts += ("-Dplugin.version=" + version.value),
scriptedBufferLog := false,
libraryDependencies ++= Seq(
`zio-json-yaml`,
`zio-test`,
`zio-test-sbt`,
)
).dependsOn(LocalProject("zioHttpGen"))

lazy val sbtZioHttpGrpc = (project in file("sbt-zio-http-grpc"))
.settings(stdSettings("sbt-zio-http-grpc"))
.settings(publishSetting(true))
Expand Down
2 changes: 1 addition & 1 deletion project/BuildHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ object BuildHelper extends ScalaSettings {
val ScoverageVersion = "2.0.12"
val JmhVersion = "0.4.7"

val stdOptions = Seq(
private val stdOptions = Seq(
"-deprecation",
"-encoding",
"UTF-8",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.6
sbt.version=1.10.0

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 53a9643

Please sign in to comment.