Skip to content

Commit ef8baaf

Browse files
Upgrade versions of SBT project (#1001)
Co-authored-by: Bogdan Kobylynskyi <[email protected]>
1 parent 5fde099 commit ef8baaf

File tree

11 files changed

+20
-21
lines changed

11 files changed

+20
-21
lines changed

plugins/sbt/graphql-java-codegen-sbt-plugin/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ lazy val `graphql-codegen-sbt-plugin` = Project(id = "graphql-codegen-sbt-plugin
3535
"org.freemarker" % "freemarker" % "2.3.31",
3636
"com.graphql-java" % "graphql-java" % "16.2",
3737
"com.fasterxml.jackson.core" % "jackson-databind" % "2.12.1",
38-
"com.typesafe" % "config" % "1.4.1"
38+
"com.typesafe" % "config" % "1.4.2"
3939
),
4040
buildInfoKeys := Seq[BuildInfoKey](name, version, sbtVersion, jValidationVersion),
4141
buildInfoPackage := "io.github.dreamylost.graphql.codegen"

plugins/sbt/graphql-java-codegen-sbt-plugin/project/Publishing.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import xerial.sbt.Sonatype.autoImport.sonatypeProfileName
55
/**
66
* sbt publish setting
77
*
8-
* @author 梦境迷离 dreamylost
8+
* @author 梦境迷离
99
* @since 2020-07-19
1010
* @version v1.0
1111
*/
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.7
1+
sbt.version=1.7.1
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")
2-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
3-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
4-
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
5-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
2+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
3+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.13")
4+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
5+
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")

plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/Compat.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import sbt.Configuration
99

1010
/**
1111
*
12-
* @author 梦境迷离 dreamylost
12+
* @author 梦境迷离
1313
* @since 2020-07-18
1414
* @version v1.0
1515
*/

plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenKeys.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ package io.github.dreamylost.graphql.codegen
22

33
import java.util
44

5-
import com.kobylynskyi.graphql.codegen.model.{ ApiInterfaceStrategy, ApiNamePrefixStrategy, ApiRootInterfaceStrategy, RelayConfig }
5+
import com.kobylynskyi.graphql.codegen.model._
66
import sbt._
7-
import com.kobylynskyi.graphql.codegen.model.GeneratedLanguage
87

98
/**
109
*
11-
10+
* @author 梦境迷离
1211
* @version 1.0,2020/7/15
1312
*/
1413
trait GraphQLCodegenKeys {
@@ -126,11 +125,11 @@ trait GraphQLCodegenKeys {
126125

127126
val generateSealedInterfaces = settingKey[Boolean]("If true, generate sealed interfaces for GraphQL unions and interfaces, else generate normal interfaces.")
128127

129-
val generateJacksonTypeIdResolver = settingKey[Boolean]("Specifies whether generated union interfaces should be annotated with a custom Jackson type id resolver generated in model package")
128+
val generateJacksonTypeIdResolver = settingKey[Boolean]("Specifies whether generated union interfaces should be annotated with a custom Jackson type id resolver generated in model package.")
130129

131130
//for version
132131
val javaxValidationApiVersion = settingKey[Option[String]]("javax-validation-api version")
133-
val graphqlJavaCodegenVersion = settingKey[Option[String]]("graphql java codegen version")
132+
val graphqlJavaCodegenVersion = settingKey[Option[String]]("graphql-java-codegen version")
134133

135134
//some others for sbt
136135
val generateCodegenTargetPath = settingKey[File]("Where to store generated files and add the generated code to the classpath, so that they can be referenced.")

plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.kobylynskyi.graphql.codegen.model._
66
import com.kobylynskyi.graphql.codegen.model.exception.LanguageNotSupportedException
77
import com.kobylynskyi.graphql.codegen.model.GeneratedLanguage._
88
import com.kobylynskyi.graphql.codegen.scala.ScalaGraphQLCodegen
9-
import com.kobylynskyi.graphql.codegen.supplier.{ MergeableMappingConfigSupplier, SchemaFinder }
9+
import com.kobylynskyi.graphql.codegen.supplier._
1010
import sbt.{ AutoPlugin, PluginTrigger, _ }
1111
import sbt.Keys.{ sLog, sourceManaged, _ }
1212
import sbt.internal.util.complete.DefaultParsers.spaceDelimited
@@ -19,7 +19,7 @@ import sbt.Def
1919

2020
/**
2121
*
22-
22+
* @author 梦境迷离
2323
* @version 1.0,2020/7/15
2424
*/
2525
object GraphQLCodegenPlugin extends GraphQLCodegenPlugin(Compile, configurationPostfix = "-main") {

plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/ParentInterfacesConfig.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package io.github.dreamylost.graphql.codegen
22

33
/**
44
*
5-
5+
* @author 梦境迷离
66
* @version 1.0,2020/7/15
77
*/
8-
case class ParentInterfacesConfig(
8+
final case class ParentInterfacesConfig(
99
queryResolver: String = null,
1010
mutationResolver: String = null,
1111
subscriptionResolver: String = null,

plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/SchemaFinderConfig.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import com.kobylynskyi.graphql.codegen.supplier.SchemaFinder
44

55
/**
66
*
7-
7+
* @author 梦境迷离
88
* @version 1.0,2020/7/15
99
*/
10-
case class SchemaFinderConfig(
10+
final case class SchemaFinderConfig(
1111
rootDir: String,
1212
recursive: Boolean = SchemaFinder.DEFAULT_RECURSIVE,
1313
includePattern: String = SchemaFinder.DEFAULT_INCLUDE_PATTERN,

plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/simple/src/main/scala/io/github/kobylynskyi/graphql/test/api/impl/GetUserQueryResolverImpl.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import scala.concurrent.Future
88
/**
99
* example, use a async api
1010
*
11-
* @author 梦境迷离 dreamylost
11+
* @author 梦境迷离
1212
* @since 2020-07-19
1313
* @version v1.0
1414
*/

0 commit comments

Comments
 (0)