Update dependencies and IDE plugin (#758)

* Update gradle to 8.13 * Fix deprecation * Update dependencies and remove dead code * Remove deprecated and now not necessary configuration call * Update target ide plugin version and fix deprecations * Fix plugin not compatible and older plugin version suggested See: #755 * Update gradle of harness projects to `8.13` as well * Update foojay resolver convention to `0.9.0` * Replace deprecated task creations with task registrations * Set from version correctly * Remove now needless suppressions * Fix export type check --------- Co-authored-by: chippmann <[email protected]>
utopia-rise · Mar 1, 2025 · fce31d9 · fce31d9
1 parent 4d3ea1c
commit fce31d9
Show file tree

Hide file tree

Showing 50 changed files with 197 additions and 140 deletions.
diff --git a/harness/bunnymark/gradle/wrapper/gradle-wrapper.jar b/harness/bunnymark/gradle/wrapper/gradle-wrapper.jar
diff --git a/harness/bunnymark/gradle/wrapper/gradle-wrapper.properties b/harness/bunnymark/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/harness/bunnymark/gradlew b/harness/bunnymark/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -203,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

diff --git a/harness/bunnymark/gradlew.bat b/harness/bunnymark/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

diff --git a/harness/flattened-library-tests/gradle/wrapper/gradle-wrapper.jar b/harness/flattened-library-tests/gradle/wrapper/gradle-wrapper.jar
diff --git a/harness/flattened-library-tests/gradle/wrapper/gradle-wrapper.properties b/harness/flattened-library-tests/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/harness/flattened-library-tests/gradlew b/harness/flattened-library-tests/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/harness/flattened-library-tests/gradlew.bat b/harness/flattened-library-tests/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

diff --git a/harness/fqname-library-tests/gradle/wrapper/gradle-wrapper.jar b/harness/fqname-library-tests/gradle/wrapper/gradle-wrapper.jar
diff --git a/harness/fqname-library-tests/gradle/wrapper/gradle-wrapper.properties b/harness/fqname-library-tests/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/harness/fqname-library-tests/gradlew b/harness/fqname-library-tests/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/harness/fqname-library-tests/gradlew.bat b/harness/fqname-library-tests/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

diff --git a/harness/hierarchical-library-tests/gradle/wrapper/gradle-wrapper.jar b/harness/hierarchical-library-tests/gradle/wrapper/gradle-wrapper.jar
diff --git a/harness/hierarchical-library-tests/gradle/wrapper/gradle-wrapper.properties b/harness/hierarchical-library-tests/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/harness/hierarchical-library-tests/gradlew b/harness/hierarchical-library-tests/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/harness/hierarchical-library-tests/gradlew.bat b/harness/hierarchical-library-tests/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

diff --git a/harness/tests/gradle/wrapper/gradle-wrapper.jar b/harness/tests/gradle/wrapper/gradle-wrapper.jar
diff --git a/harness/tests/gradle/wrapper/gradle-wrapper.properties b/harness/tests/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/harness/tests/gradlew b/harness/tests/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -203,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

diff --git a/harness/tests/gradlew.bat b/harness/tests/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

diff --git a/kt/api-generator/build.gradle.kts b/kt/api-generator/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(libs.versions.toolchain.jvm.get().toInt())
 }
 
 gradlePlugin {

diff --git a/kt/api-generator/settings.gradle.kts b/kt/api-generator/settings.gradle.kts
@@ -27,7 +27,7 @@ dependencyResolutionManagement {
 
 plugins {
     // to automatically download the toolchain jdk if missing
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.6.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" // https://plugins.gradle.org/plugin/org.gradle.toolchains.foojay-resolver-convention
 }
 
 includeBuild("../tools-common") {

diff --git a/kt/build-logic/convention/build.gradle.kts b/kt/build-logic/convention/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(libs.versions.toolchain.jvm.get().toInt())
 }
 
 dependencies {

diff --git a/kt/build-logic/settings.gradle.kts b/kt/build-logic/settings.gradle.kts
@@ -21,7 +21,7 @@ dependencyResolutionManagement {
 
 plugins {
     // to automatically download the toolchain jdk if missing
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.6.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" // https://plugins.gradle.org/plugin/org.gradle.toolchains.foojay-resolver-convention
 }
 
 rootProject.name = "build-logic"

diff --git a/kt/build.gradle.kts b/kt/build.gradle.kts
@@ -20,7 +20,7 @@ subprojects {
 
 tasks {
     @Suppress("UNUSED_VARIABLE")
-    val generateChangelog by creating {
+    val generateChangelog by registering {
         group = "godot-kotlin-jvm"
 
         doLast {
@@ -52,7 +52,7 @@ tasks {
             }.writeText(changelogString)
         }
     }
-    val buildEngineDebug by creating(Exec::class) {
+    val buildEngineDebug by registering(Exec::class) {
         group = "godot-kotlin-jvm"
 
         workingDir = File(rootProject.projectDir, "../../..")
@@ -72,7 +72,7 @@ tasks {
             commandLine("scons", "p=$platform", "-j$coresAvailable")
         }
     }
-    val buildEngineReleaseDebug by creating(Exec::class) {
+    val buildEngineReleaseDebug by registering(Exec::class) {
         group = "godot-kotlin-jvm"
 
         workingDir = File(rootProject.projectDir, "../../..")
@@ -92,7 +92,7 @@ tasks {
             commandLine("scons", "p=$platform", "target=template_debug", "-j$coresAvailable")
         }
     }
-    val runEngineDebug by creating(Exec::class) {
+    val runEngineDebug by registering(Exec::class) {
         group = "godot-kotlin-jvm"
 
         workingDir = File(rootProject.projectDir, "../../../bin")
@@ -112,7 +112,7 @@ tasks {
                 commandLine("${workingDir.absolutePath}/godot.x11.tools.64", "-v")
         }
     }
-    val runEngineReleaseDebug by creating(Exec::class) {
+    val runEngineReleaseDebug by registering(Exec::class) {
         group = "godot-kotlin-jvm"
 
         workingDir = File(rootProject.projectDir, "../../../bin")
@@ -133,13 +133,13 @@ tasks {
         }
     }
     @Suppress("UNUSED_VARIABLE")
-    val buildAndRunEngineDebug by creating {
+    val buildAndRunEngineDebug by registering {
         group = "godot-kotlin-jvm"
         dependsOn(buildEngineDebug, getTasksByName("copyBootstrapJar", true).first())
         finalizedBy(runEngineDebug)
     }
     @Suppress("UNUSED_VARIABLE")
-    val buildAndRunEngineReleaseDebug by creating {
+    val buildAndRunEngineReleaseDebug by registering {
         group = "godot-kotlin-jvm"
         dependsOn(buildEngineReleaseDebug, getTasksByName("copyBootstrapJar", true).first())
         finalizedBy(runEngineReleaseDebug)

diff --git a/kt/common/build.gradle.kts b/kt/common/build.gradle.kts
@@ -13,13 +13,13 @@ version = fullGodotKotlinJvmVersion
 group = "com.utopia-rise"
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(libs.versions.toolchain.jvm.get().toInt())
 }
 
 publishing {
     publications {
         @Suppress("UNUSED_VARIABLE")
-        val godotCommonGenerator by creating(MavenPublication::class) {
+        val godotCommonGenerator by registering(MavenPublication::class) {
             pom {
                 name.set(project.name)
                 description.set("Godot common module other libraries.")

diff --git a/kt/common/settings.gradle.kts b/kt/common/settings.gradle.kts
@@ -26,5 +26,5 @@ dependencyResolutionManagement {
 
 plugins {
     // to automatically download the toolchain jdk if missing
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.6.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" // https://plugins.gradle.org/plugin/org.gradle.toolchains.foojay-resolver-convention
 }
diff --git a/kt/entry-generation/godot-entry-generator/build.gradle.kts b/kt/entry-generation/godot-entry-generator/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(libs.versions.toolchain.jvm.get().toInt())
 }
 
 dependencies {

diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/build.gradle.kts b/kt/entry-generation/godot-kotlin-symbol-processor/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(libs.versions.toolchain.jvm.get().toInt())
 }
 
 dependencies {

diff --git a/...symbol-processor/src/main/kotlin/godot/annotation/processor/GodotKotlinSymbolProcessor.kt b/...symbol-processor/src/main/kotlin/godot/annotation/processor/GodotKotlinSymbolProcessor.kt
@@ -5,7 +5,6 @@ import com.google.devtools.ksp.processing.KSPLogger
 import com.google.devtools.ksp.processing.Resolver
 import com.google.devtools.ksp.processing.SymbolProcessor
 import com.google.devtools.ksp.symbol.KSAnnotated
-import godot.annotation.processor.compiler.CompilerDataProvider
 import godot.annotation.processor.processing.ProcessingRound
 import godot.annotation.processor.processing.ProcessingRoundsBlackboard
 import godot.annotation.processor.processing.RoundGenerateRegistrarsForCurrentProjectAndDependencyRegistrationFiles
@@ -44,12 +43,6 @@ class GodotKotlinSymbolProcessor(
     override fun process(resolver: Resolver): List<KSAnnotated> {
         processingRound++
         if (processingRound == 0) {
-            CompilerDataProvider.init(
-                resolver,
-                options["srcDirs"]
-                    ?.split(File.pathSeparator)
-                    ?: throw IllegalStateException("No srcDirs option provided")
-            )
             settings = provideSettingsFromArguments()
         }