Upgrade dependencies and run ktlint format (#766)

* Upgrade dependecies and run ktlint format

* Use same default junit version for plugin

* Use published version of ktor-client-cio

Co-authored-by: Shane Myrick <[email protected]>

Author: smyrick

examples/federation/base-app/src/main/kotlin/com/expediagroup/graphql/examples/hooks/CustomFederationSchemaGeneratorHooks.kt

@@ -47,9 +47,9 @@ internal val graphqlUUIDType = GraphQLScalarType.newScalar()
 
 private object UUIDCoercing : Coercing<UUID, String> {
     override fun parseValue(input: Any?): UUID = UUID.fromString(
-            serialize(
-                    input
-            )
+        serialize(
+            input
+        )
     )
 
     override fun parseLiteral(input: Any?): UUID? {

examples/gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

examples/gradle/wrapper/gradle-wrapper.properties

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

examples/gradlew

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

examples/gradlew.bat

@@ -67,7 +67,7 @@ class Application {
 
             options("/graphql") { _, _ -> "ok" }
 
-            before("/graphql") { request, response ->
+            before("/graphql") { _, response ->
                 response.header("Access-Control-Allow-Origin", "*")
                 response.header("Access-Control-Allow-Methods", "GET,POST,OPTIONS")
             }

examples/spark/src/main/kotlin/com/expediagroup/graphql/examples/spark/Application.kt

@@ -9,6 +9,7 @@ val springBootVersion: String by project
 val reactorVersion: String by project
 
 dependencies {
+    implementation("javax.validation", "validation-api", "2.0.1.Final")
     testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
     testImplementation("io.projectreactor:reactor-test:$reactorVersion")
 }

examples/spring/build.gradle.kts

@@ -15,5 +15,6 @@ class MyGraphQLContextFactory : GraphQLContextFactory<MyGraphQLContext> {
         myCustomValue = request.headers.getFirst("MyHeader") ?: "defaultContext",
         request = request,
         response = response,
-        subscriptionValue = null)
+        subscriptionValue = null
+    )
 }

examples/spring/src/main/kotlin/com/expediagroup/graphql/examples/context/MyGraphQLContextFactory.kt

@@ -20,8 +20,9 @@ import com.expediagroup.graphql.annotations.GraphQLDirective
 import graphql.introspection.Introspection.DirectiveLocation
 
 @GraphQLDirective(
-        description = "This validates string input",
-        locations = [DirectiveLocation.FIELD, DirectiveLocation.FIELD_DEFINITION, DirectiveLocation.ARGUMENT_DEFINITION])
+    description = "This validates string input",
+    locations = [DirectiveLocation.FIELD, DirectiveLocation.FIELD_DEFINITION, DirectiveLocation.ARGUMENT_DEFINITION]
+)
 annotation class StringEval(
     val default: String = "",
     val lowerCase: Boolean = false

examples/spring/src/main/kotlin/com/expediagroup/graphql/examples/directives/StringEval.kt

@@ -44,8 +44,8 @@ class StringEvalSchemaDirectiveWiring : KotlinSchemaDirectiveWiring {
                 }
             }
             val newEnv = newDataFetchingEnvironment(dataEnv)
-                    .arguments(newArguments)
-                    .build()
+                .arguments(newArguments)
+                .build()
             originalDataFetcher.get(newEnv)
         }
         environment.setDataFetcher(defaultValueFetcher)