chore: update to latest Gradle and Maven versions (#1875)

ExpediaGroup · Oct 30, 2023 · f056e9d · f056e9d
1 parent 4c6a625
commit f056e9d
Show file tree

Hide file tree

Showing 57 changed files with 464 additions and 557 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,6 @@ import java.time.Duration
 description = "Libraries for running a GraphQL server in Kotlin"
 extra["isReleaseVersion"] = !version.toString().endsWith("SNAPSHOT")
 
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: remove once KTIJ-19369 / Gradle#22797 is fixed
 plugins {
     alias(libs.plugins.nexus.publish)
 }

diff --git a/clients/graphql-kotlin-client-serialization/build.gradle.kts b/clients/graphql-kotlin-client-serialization/build.gradle.kts
@@ -1,6 +1,5 @@
 description = "GraphQL client serializer based on kotlinx.serialization"
 
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: remove once KTIJ-19369 / Gradle#22797 is fixed
 plugins {
     id("com.expediagroup.graphql.conventions")
     alias(libs.plugins.kotlin.serialization)

diff --git a/clients/graphql-kotlin-ktor-client/build.gradle.kts b/clients/graphql-kotlin-ktor-client/build.gradle.kts
@@ -1,6 +1,5 @@
 description = "A lightweight typesafe GraphQL HTTP Client based on Ktor HttpClient"
 
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: remove once KTIJ-19369 / Gradle#22797 is fixed
 plugins {
     id("com.expediagroup.graphql.conventions")
     alias(libs.plugins.kotlin.serialization)

diff --git a/clients/graphql-kotlin-spring-client/build.gradle.kts b/clients/graphql-kotlin-spring-client/build.gradle.kts
@@ -1,6 +1,5 @@
 description = "A lightweight typesafe GraphQL HTTP Client based on Spring WebClient"
 
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: remove once KTIJ-19369 / Gradle#22797 is fixed
 plugins {
     id("com.expediagroup.graphql.conventions")
     alias(libs.plugins.kotlin.serialization)

diff --git a/examples/client/gradle-client/build.gradle.kts b/examples/client/gradle-client/build.gradle.kts
@@ -4,7 +4,6 @@ import com.expediagroup.graphql.plugin.gradle.graphql
 
 description = "Example usage of Gradle plugin to generate GraphQL Kotlin Client"
 
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: remove once KTIJ-19369 / Gradle#22797 is fixed
 plugins {
     id("com.expediagroup.graphql.examples.conventions")
     id("com.expediagroup.graphql")

diff --git a/examples/client/maven-client/.mvn/wrapper/MavenWrapperDownloader.java b/examples/client/maven-client/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/examples/client/maven-client/.mvn/wrapper/maven-wrapper.jar b/examples/client/maven-client/.mvn/wrapper/maven-wrapper.jar
diff --git a/examples/client/maven-client/.mvn/wrapper/maven-wrapper.properties b/examples/client/maven-client/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar