diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/build.sbt b/plugins/sbt/graphql-java-codegen-sbt-plugin/build.sbt index db7d118d69675e17fd3f725e2a2ddcaa4461aae6..b2a7cb62b552d7ea1086e94904564e1328fbf82a 100644 --- a/plugins/sbt/graphql-java-codegen-sbt-plugin/build.sbt +++ b/plugins/sbt/graphql-java-codegen-sbt-plugin/build.sbt @@ -1,21 +1,19 @@ -import Dependencies._ import sbtrelease.ReleaseStateTransformations._ 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") +jValidationVersion := "2.0.1.Final" -// publish only root project -//publish / skip := true - -//keep version is equals with parent project `graphql-java-codegen` +// 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). + enablePlugins(SbtPlugin, BuildInfoPlugin). settings(Publishing.publishSettings). settings( sbtPlugin := true, - scalaVersion := Versions.scala212, - crossScalaVersions := List(Versions.scala212, Versions.scala211), + scalaVersion := "2.12.12", scriptedBufferLog := false, scriptedLaunchOpts += s"-Dplugin.version=${version.value}", scalacOptions += "-target:jvm-1.8", @@ -32,5 +30,10 @@ lazy val `graphql-codegen-sbt-plugin` = Project(id = "graphql-codegen-sbt-plugin setNextVersion, commitNextVersion, pushChanges - )). - settings(Compiles.selfDependencies) \ No newline at end of file + ), + libraryDependencies ++= Seq( + "io.github.kobylynskyi" % "graphql-java-codegen" % (version in ThisBuild).value + ), + buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion, jValidationVersion), + buildInfoPackage := "io.github.dreamylost.graphql.codegen" + ) \ No newline at end of file diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/project/Dependencies.scala b/plugins/sbt/graphql-java-codegen-sbt-plugin/project/Dependencies.scala deleted file mode 100644 index b4a418f74163170d25f735f4eebb22e1f5e4768e..0000000000000000000000000000000000000000 --- a/plugins/sbt/graphql-java-codegen-sbt-plugin/project/Dependencies.scala +++ /dev/null @@ -1,27 +0,0 @@ -import sbt.Keys.libraryDependencies -import sbt._ - -/** - * The dependence of the plugin itself - * - * @author 梦境迷离 dreamylost - * @since 2020-07-19 - * @version v1.0 - */ -object Dependencies { - - object Versions { - lazy val scala212 = "2.12.12" - lazy val scala211 = "2.11.12" - val codegen = "4.0.2-SNAPSHOT" - } - - import Versions._ - - object Compiles { - val selfDependencies = libraryDependencies ++= Seq( - "io.github.kobylynskyi" % "graphql-java-codegen" % codegen - ) - } - -} 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 b7c722508416bddbeb7d5574555d17674c88e318..1ac901cf6a56406bec6489761f17fc23853f8b6d 100644 --- a/plugins/sbt/graphql-java-codegen-sbt-plugin/project/plugins.sbt +++ b/plugins/sbt/graphql-java-codegen-sbt-plugin/project/plugins.sbt @@ -1,4 +1,5 @@ addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1") -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") \ No newline at end of file +addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") \ No newline at end of file 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 31cf97329621b836b3089aa807def68a2bc6939c..7e82c5bd907df88d8409f3a2e208d2081058d6ff 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 @@ -29,11 +29,9 @@ object GraphQLCodegenPlugin extends GraphQLCodegenPlugin(Compile, configurationP class GraphQLCodegenPlugin(configuration: Configuration, private[codegen] val configurationPostfix: String = "") extends AutoPlugin with Compat { self => - //TODO if impl GraphQLCodegenConfiguration, can not use settingKey in override method - //override this by graphqlJavaCodegenVersion and javaxValidationApiVersion - private val jValidation = "2.0.1.Final" - private val codegen = "4.0.2-SNAPSHOT" + private val jValidation = BuildInfo.jValidationVersion + private val codegen = BuildInfo.version object GlobalImport extends GraphQLCodegenKeys { @@ -121,7 +119,6 @@ class GraphQLCodegenPlugin(configuration: Configuration, private[codegen] val co private def getMappingConfig(): Def.Initialize[MappingConfig] = Def.setting[MappingConfig] { - //TODO use builder val mappingConfig = new MappingConfig mappingConfig.setPackageName((generatePackageName in GraphQLCodegenConfig).value.orNull) mappingConfig.setCustomTypesMapping((customTypesMapping in GraphQLCodegenConfig).value) @@ -168,8 +165,7 @@ class GraphQLCodegenPlugin(configuration: Configuration, private[codegen] val co mappingConfig.setResponseProjectionMaxDepth((responseProjectionMaxDepth in GraphQLCodegenConfig).value) mappingConfig.setRelayConfig((relayConfig in GraphQLCodegenConfig).value) mappingConfig.setGeneratedLanguage((generatedLanguage in GraphQLCodegenConfig).value) - - // sLog.value.debug(s"Current mapping config is <$mappingConfig>") // NO toString + sLog.value.info(s"Version is <${BuildInfo.toString}>") mappingConfig }