diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..7454180f2a 100644
Binary files a/examples/gradle/wrapper/gradle-wrapper.jar and b/examples/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 05679dc3c1..ffed3a254e 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
index 4f906e0c81..744e882ed5 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
diff --git a/gradle.properties b/gradle.properties
index 46f36a2aef..8af693efc0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,35 +16,35 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError
 # dependencies
 kotlinJvmVersion = 1.8
 kotlinVersion = 1.5.21
-kotlinCoroutinesVersion = 1.5.0
-kotlinxSerializationVersion = 1.2.1
+kotlinCoroutinesVersion = 1.5.1
+kotlinxSerializationVersion = 1.2.2
 
-androidPluginVersion = 4.2.2
-classGraphVersion = 4.8.110
-federationGraphQLVersion = 0.6.4
-graphQLJavaVersion = 17.1
-jacksonVersion = 2.12.4
-kotlinPoetVersion = 1.8.0
-ktorVersion = 1.6.1
-reactorVersion = 3.4.8
+androidPluginVersion = 7.0.1
+classGraphVersion = 4.8.115
+federationGraphQLVersion = 0.6.5
+graphQLJavaVersion = 17.2
+jacksonVersion = 2.12.5
+kotlinPoetVersion = 1.9.0
+ktorVersion = 1.6.3
+reactorVersion = 3.4.9
 reactorExtensionsVersion = 1.1.3
 slf4jVersion = 1.7.30
 springBootVersion = 2.5.3
 springVersion = 5.3.9
 
 # test dependency versions
-compileTestingVersion = 1.4.2
+compileTestingVersion = 1.4.3
 junitVersion = 5.7.2
-mockkVersion = 1.11.0
+mockkVersion = 1.12.0
 mustacheVersion = 0.9.10
-rxjavaVersion = 3.0.13
-wireMockVersion = 2.28.1
+rxjavaVersion = 3.1.0
+wireMockVersion = 2.30.1
 
 # plugin versions
-detektVersion = 1.17.1
+detektVersion = 1.18.0
 dokkaVersion = 1.5.0
 jacocoVersion = 0.8.7
-ktlintVersion = 0.41.0
+ktlintVersion = 0.42.1
 ktlintPluginVersion = 10.1.0
 mavenPluginDevelopmentVersion = 0.3.1
 nexusPublishPluginVersion = 1.1.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..7454180f2a 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 05679dc3c1..ffed3a254e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c81..744e882ed5 100755
--- a/gradlew
+++ b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/DownloadSchemaTest.kt b/plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/DownloadSchemaTest.kt
index 1bddae1301..dec1dd8357 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/DownloadSchemaTest.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/DownloadSchemaTest.kt
@@ -62,7 +62,7 @@ class DownloadSchemaTest {
                     if: Boolean!
                   ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-                "Marks the field or enum value as deprecated"
+                "Marks the field, argument, input field or enum value as deprecated"
                 directive @deprecated(
                     "The reason for the deprecation"
                     reason: String! = "No longer supported"
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/IntrospectSchemaTest.kt b/plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/IntrospectSchemaTest.kt
index d65f2334fd..4743dfabf5 100755
--- a/plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/IntrospectSchemaTest.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/IntrospectSchemaTest.kt
@@ -59,7 +59,7 @@ class IntrospectSchemaTest {
                     if: Boolean!
                   ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-                "Marks the field or enum value as deprecated"
+                "Marks the field, argument, input field or enum value as deprecated"
                 directive @deprecated(
                     "The reason for the deprecation"
                     reason: String = "No longer supported"
diff --git a/plugins/graphql-kotlin-gradle-plugin/src/integration/android/androidGraphQLClient/build.gradle.kts b/plugins/graphql-kotlin-gradle-plugin/src/integration/android/androidGraphQLClient/build.gradle.kts
index e5cd88cc1b..78111f115b 100644
--- a/plugins/graphql-kotlin-gradle-plugin/src/integration/android/androidGraphQLClient/build.gradle.kts
+++ b/plugins/graphql-kotlin-gradle-plugin/src/integration/android/androidGraphQLClient/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
         }
     }
 
-    val androidPluginVersion = System.getenv("ANDROID_PLUGIN_VERSION") ?: "4.2.2"
+    val androidPluginVersion = System.getenv("ANDROID_PLUGIN_VERSION") ?: "7.0.1"
     val graphQLKotlinVersion = System.getenv("GRAPHQL_KOTLIN_VERSION") ?: "5.0.0-SNAPSHOT"
     val kotlinVersion = System.getenv("KOTLIN_VERSION") ?: "1.5.21"
     dependencies {
diff --git a/plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginIT.kt b/plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginIT.kt
index 7a38adb9a3..1c8ef551ee 100755
--- a/plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginIT.kt
+++ b/plugins/graphql-kotlin-gradle-plugin/src/test/kotlin/com/expediagroup/graphql/plugin/gradle/GraphQLGradlePluginIT.kt
@@ -256,9 +256,10 @@ class GraphQLGradlePluginIT : GraphQLGradlePluginAbstractIT() {
                     "Application",
                     mapOf(
                         "ktorClient" to useKtorClient,
+                        "useJackson" to (serializer == GraphQLSerializer.JACKSON),
                         "defaultHeader" to mapOf("name" to defaultHeaderName, "value" to defaultHeaderValue),
                         "requestHeader" to mapOf("name" to customHeaderName, "value" to customHeaderValue),
-                        "optionalInputWrapper" to (serializer == GraphQLSerializer.JACKSON)
+                        "optionalInputWrapper" to true
                     )
                 )
             )
diff --git a/plugins/graphql-kotlin-gradle-plugin/src/test/resources/templates/Application.mustache b/plugins/graphql-kotlin-gradle-plugin/src/test/resources/templates/Application.mustache
index a2a5626aa2..d9b42f405e 100644
--- a/plugins/graphql-kotlin-gradle-plugin/src/test/resources/templates/Application.mustache
+++ b/plugins/graphql-kotlin-gradle-plugin/src/test/resources/templates/Application.mustache
@@ -6,7 +6,14 @@ import com.example.generated.inputs.SimpleArgumentInput
 import com.example.generated.junitquery.BasicObject2
 import com.example.generated.junitquery.ScalarWrapper
 import com.example.generated.junitquery.SecondInterfaceImplementation
-{{#optionalInputWrapper}}import com.expediagroup.graphql.client.jackson.types.OptionalInput{{/optionalInputWrapper}}
+{{#optionalInputWrapper}}
+{{#useJackson}}
+import com.expediagroup.graphql.client.jackson.types.OptionalInput
+{{/useJackson}}
+{{^useJackson}}
+import com.expediagroup.graphql.client.serialization.types.OptionalInput
+{{/useJackson}}
+{{/optionalInputWrapper}}
 {{#ktorClient}}
 import com.expediagroup.graphql.client.ktor.GraphQLKtorClient
 {{#defaultHeader}}