diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 34a70e284..f16c16112 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -205,7 +205,12 @@ jobs: - name: Release SBT plugin if: github.event.inputs.publish_sbt_plugin == 'Y' working-directory: plugins/sbt/graphql-java-codegen-sbt-plugin - run: sbt release with-defaults default-tag-exists-answer k + run: sbt ci-release + env: + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + PGP_SECRET: ${{ secrets.PGP_SECRET }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} # # PUBLISH OF RELEASE VERSION COMPLETED diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/build.sbt b/plugins/sbt/graphql-java-codegen-sbt-plugin/build.sbt index 631539f3c..dd56e4b25 100644 --- a/plugins/sbt/graphql-java-codegen-sbt-plugin/build.sbt +++ b/plugins/sbt/graphql-java-codegen-sbt-plugin/build.sbt @@ -1,35 +1,19 @@ -import sbtrelease.ReleaseStateTransformations._ +import sbt.url -name := "graphql-codegen-sbt-plugin" -// must be equals to oss Group Id -organization := "io.github.jxnu-liguobin" -val jValidationVersion = settingKey[String]("default java Validation api").withRank(KeyRanks.Invisible) -jValidationVersion := "2.0.1.Final" +val javaValidationVersion = settingKey[String]("default Java Validation API") + .withRank(KeyRanks.Invisible) +javaValidationVersion := "2.0.1.Final" // keep version is equals with parent project `graphql-java-codegen`. // Plugin don't need to care about the scala version, just the SBT version. lazy val `graphql-codegen-sbt-plugin` = Project(id = "graphql-codegen-sbt-plugin", base = file(".")) .enablePlugins(SbtPlugin, BuildInfoPlugin) - .settings(Publishing.publishSettings) .settings( sbtPlugin := true, scriptedBufferLog := false, commands ++= Commands.value, scriptedLaunchOpts += s"-Dplugin.version=${version.value}", scalacOptions += "-target:jvm-1.8", - releaseIgnoreUntrackedFiles := true, - releaseProcess := Seq[ReleaseStep]( - checkSnapshotDependencies, - inquireVersions, - runClean, - setReleaseVersion, - commitReleaseVersion, - tagRelease, - releaseStepCommandAndRemaining("^ publishSigned"), - setNextVersion, - commitNextVersion, - pushChanges - ), libraryDependencies ++= Seq( "io.github.kobylynskyi" % "graphql-java-codegen" % (ThisBuild / version).value, "org.freemarker" % "freemarker" % "2.3.31", @@ -37,6 +21,25 @@ lazy val `graphql-codegen-sbt-plugin` = Project(id = "graphql-codegen-sbt-plugin "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.1", "com.typesafe" % "config" % "1.4.2" ), - buildInfoKeys := Seq[BuildInfoKey](name, version, sbtVersion, jValidationVersion), + buildInfoKeys := Seq[BuildInfoKey](name, version, sbtVersion, javaValidationVersion), buildInfoPackage := "io.github.dreamylost.graphql.codegen" ) + +inThisBuild( + List( + name := "graphql-codegen-sbt-plugin", + organization := "io.github.jxnu-liguobin", + sonatypeCredentialHost := "oss.sonatype.org", + sonatypeRepository := "https://oss.sonatype.org/service/local", + homepage := Some(url("https://github.com/kobylynskyi/graphql-java-codegen")), + licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")), + developers := List( + Developer( + id = "jxnu-liguobin", + name = "梦境迷离", + email = "dreamylost@outlook.com", + url = url("https://github/jxnu-liguobin") + ) + ) + ) +) diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/project/Publishing.scala b/plugins/sbt/graphql-java-codegen-sbt-plugin/project/Publishing.scala deleted file mode 100644 index 2e0749b58..000000000 --- a/plugins/sbt/graphql-java-codegen-sbt-plugin/project/Publishing.scala +++ /dev/null @@ -1,47 +0,0 @@ -import sbt._ -import sbt.Keys._ -import xerial.sbt.Sonatype.autoImport.sonatypeProfileName - -/** sbt publish setting - * - * @author - * 梦境迷离 - * @since 2020-07-19 - * @version v1.0 - */ -object Publishing { - - // publish by sbt publishSigned - lazy val publishSettings = Seq( - credentials += Credentials(Path.userHome / ".ivy2" / ".sonatype_credentials"), - publishTo := { - val nexus = "https://oss.sonatype.org/" - if (isSnapshot.value) - Some("snapshots" at nexus + "content/repositories/snapshots") - else - Some("releases" at nexus + "service/local/staging/deploy/maven2") - }, - licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")), - publishMavenStyle := true, - publishArtifact in Test := false, - pomIncludeRepository := { _ => false }, - developers := List( - Developer( - id = "dreamylost", - name = "梦境迷离", - email = "dreamylost@outlook.com", - url = url("https://blog.dreamylost.cn") - ) - ), - sonatypeProfileName := organization.value, - isSnapshot := version.value endsWith "SNAPSHOT", - homepage := Some(url("https://github.com/jxnu-liguobin")), - scmInfo := Some( - ScmInfo( - // it is fork from https://github.com/kobylynskyi/graphql-java-codegen - url("https://github.com/jxnu-liguobin/graphql-java-codegen"), - "scm:git@github.com:jxnu-liguobin/graphql-java-codegen.git" - ) - ) - ) -} diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/project/build.properties b/plugins/sbt/graphql-java-codegen-sbt-plugin/project/build.properties index b1e589d9f..fd5b15768 100644 --- a/plugins/sbt/graphql-java-codegen-sbt-plugin/project/build.properties +++ b/plugins/sbt/graphql-java-codegen-sbt-plugin/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.1 \ No newline at end of file +sbt.version=1.9.0 \ No newline at end of file diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/project/plugins.sbt b/plugins/sbt/graphql-java-codegen-sbt-plugin/project/plugins.sbt index 77f7a7be0..c5ce247bc 100644 --- a/plugins/sbt/graphql-java-codegen-sbt-plugin/project/plugins.sbt +++ b/plugins/sbt/graphql-java-codegen-sbt-plugin/project/plugins.sbt @@ -1,5 +1,3 @@ -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.13") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala index b4657856a..6622c0d45 100644 --- a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala +++ b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala @@ -11,7 +11,6 @@ import com.kobylynskyi.graphql.codegen.supplier._ import sbt.{ AutoPlugin, PluginTrigger, _ } import sbt.Keys.{ sLog, sourceManaged, _ } import sbt.internal.util.complete.DefaultParsers.spaceDelimited -import com.kobylynskyi.graphql.codegen.kotlin.KotlinGraphQLCodegen import java.nio.file.{ Path, Paths } import java.util.{ HashMap => JHashMap, HashSet => JHashSet, List => JList } @@ -32,13 +31,13 @@ class GraphQLCodegenPlugin(configuration: Configuration, private[codegen] val co with Compat { self => - private val jValidation = BuildInfo.jValidationVersion - private val codegen = BuildInfo.version + private val javaValidation = BuildInfo.javaValidationVersion + private val codegen = BuildInfo.version object GlobalImport extends GraphQLCodegenKeys { lazy val GraphQLCodegenPluginDependencies: Def.Setting[Seq[ModuleID]] = libraryDependencies ++= Seq( - "javax.validation" % "validation-api" % javaxValidationApiVersion.value.getOrElse(jValidation), + "javax.validation" % "validation-api" % javaxValidationApiVersion.value.getOrElse(javaValidation), "io.github.kobylynskyi" % "graphql-java-codegen" % graphqlJavaCodegenVersion.value.getOrElse(codegen) ) @@ -282,14 +281,6 @@ class GraphQLCodegenPlugin(configuration: Configuration, private[codegen] val co mappingConfig, mappingConfigSupplier.orNull ) - case KOTLIN => - new KotlinGraphQLCodegen( - getSchemas(), - _introspectionResult, - _outputDir, - mappingConfig, - mappingConfigSupplier.orNull - ) case _ => throw new LanguageNotSupportedException(language) }