Upgrade Gradle and enhance gradlew script

Gradle version is updated from 8.4 to 8.6. Changes are added to the gradlew script to handle edge cases where 'java' command could not be found in PATH and to disregard cd standard output for $CDPATH. Added a new 'validateDistributionUrl' property and introduced the 'ParsingMethod' import. New gradle.properties file created to set JVM arguments for enabling preview and set the daemon to false.
ygdrasil-io · Feb 15, 2024 · c1fea62 · c1fea62
1 parent f05ea45
commit c1fea62
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 22 deletions.
diff --git a/bindings/angle/gradle/wrapper/gradle-wrapper.jar b/bindings/angle/gradle/wrapper/gradle-wrapper.jar
diff --git a/bindings/angle/gradle/wrapper/gradle-wrapper.properties b/bindings/angle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/bindings/angle/gradlew b/bindings/angle/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

diff --git a/bindings/angle/libangle/build.gradle.kts b/bindings/angle/libangle/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import java.net.URI
 import java.net.URL
 
 buildscript {
@@ -49,7 +50,8 @@ sourceSets.main {
 	java.srcDirs(buildDir)
 }
 
-val headerUrl = URL("https://github.com/klang-toolkit/ANGLE-binary/releases/download/2-beta/headers.zip")
+val headerUrl = URI("https://github.com/klang-toolkit/ANGLE-binary/releases/download/2-beta/headers.zip")
+	.toURL()
 
 klang {
 	download(headerUrl)

diff --git a/bindings/angle/libgles/build.gradle.kts b/bindings/angle/libgles/build.gradle.kts
@@ -2,6 +2,7 @@ import klang.domain.typeOf
 import klang.domain.unchecked
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import java.net.URI
 import java.net.URL
 
 buildscript {
@@ -50,15 +51,16 @@ sourceSets.main {
 	java.srcDirs(buildDir)
 }
 
-val headerUrl = URL("https://github.com/klang-toolkit/ANGLE-binary/releases/download/2-beta/headers.zip")
+val headerUrl = URI("https://github.com/klang-toolkit/ANGLE-binary/releases/download/2-beta/headers.zip")
+	.toURL()
 
 klang {
 	download(headerUrl)
 		.let(::unpack)
 		.let {
 			parse(fileToParse = "GLES3/gl3.h", at = it) {
 				findFunctionByName("glShaderSource")?.let { function ->
-					function.arguments.first { it.name == "string" }.apply {
+					function.arguments.first { it.name?.value == "string" }.apply {
 						type = typeOf("char *").unchecked()
 					}
 				}

diff --git a/bindings/wgpu-native/gradle.properties b/bindings/wgpu-native/gradle.properties
@@ -0,0 +1,3 @@
+# Enable to use panama class on klang gradle plugin
+org.gradle.jvmargs=--enable-preview
+org.gradle.daemon=false
diff --git a/bindings/wgpu-native/gradle/wrapper/gradle-wrapper.jar b/bindings/wgpu-native/gradle/wrapper/gradle-wrapper.jar
diff --git a/bindings/wgpu-native/gradle/wrapper/gradle-wrapper.properties b/bindings/wgpu-native/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/bindings/wgpu-native/gradlew b/bindings/wgpu-native/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_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.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

diff --git a/bindings/wgpu-native/libwgpu/build.gradle.kts b/bindings/wgpu-native/libwgpu/build.gradle.kts
@@ -1,3 +1,4 @@
+import io.ygdrasil.ParsingMethod
 import klang.domain.typeOf
 import klang.domain.unchecked
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
@@ -53,6 +54,9 @@ sourceSets.main {
 val headerUrl = URL("https://github.com/gfx-rs/wgpu-native/releases/download/v0.18.1.2/wgpu-macos-x86_64-release.zip")
 
 klang {
+
+	parsingMethod = ParsingMethod.Libclang
+
 	download(headerUrl)
 		.let(::unpack)
 		.let {

diff --git a/klang/gradle/wrapper/gradle-wrapper.jar b/klang/gradle/wrapper/gradle-wrapper.jar
diff --git a/klang/gradle/wrapper/gradle-wrapper.properties b/klang/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/klang/klang/src/main/kotlin/klang/parser/libclang/type/NativeFunction.kt b/klang/klang/src/main/kotlin/klang/parser/libclang/type/NativeFunction.kt
@@ -1,9 +1,6 @@
 package klang.parser.libclang.type
 
-import klang.domain.NativeFunction
-import klang.domain.NotBlankString
-import klang.domain.typeOf
-import klang.domain.unchecked
+import klang.domain.*
 import klang.jvm.Cursor
 import klang.jvm.DeclarationInfo
 import klang.parser.libclang.ParsingContext
@@ -17,7 +14,7 @@ internal fun ParsingContext.declareFunction(info: DeclarationInfo) {
 }
 
 private fun Cursor.arguments() = children()
-	.map { NativeFunction.Argument(it.spelling, typeOf( it.type.spelling).unchecked("fail to create type")) }
+	.map { NativeFunction.Argument(notBlankString(it.spelling), typeOf( it.type.spelling).unchecked("fail to create type")) }
 
 private fun Cursor.returnType() = type.spelling
 	.let { it.substring(0, it.indexOf("(")) }