Merge branch 'chore/checkingPluginIssue'

.github/workflows/check.yml

@@ -9,19 +9,16 @@ jobs:
     strategy:
       matrix:
         java: ['18']
-      fail-fast: false
     name: Base checks (Java ${{ matrix.Java }})
 
     steps:
 
-      - uses: actions/checkout@v1
-      - name: Setup java
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: ${{ matrix.java }}
-
-      - name: Test
-        run: ./gradlew check --stacktrace
-
+    - uses: actions/checkout@v1
+    - name: Setup java
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: ${{ matrix.java }}
 
+    - name: Test
+      run: ./gradlew check --stacktrace

ast/build.gradle.kts

@@ -10,8 +10,7 @@ repositories {
 dependencies {
     antlr("org.antlr:antlr4:4.13.1")
     implementation("com.strumenta.kolasu:kolasu-core:1.5.34")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
+    testImplementation(kotlin("test"))
 }
 
 tasks.compileKotlin {

ast/src/test/kotlin/TestAST.kt

@@ -1,7 +1,7 @@
 import com.strumenta.kuki.parser.KukiKolasuParser
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.Assertions.*
 import java.io.File
+import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class TestAST {
     @Test

build.gradle.kts

@@ -0,0 +1,26 @@
+allprojects {
+    group = "com.strumenta.kuki"
+}
+
+tasks.wrapper {
+    gradleVersion = "8.6"
+    distributionType = Wrapper.DistributionType.ALL
+}
+
+subprojects {
+    tasks.withType(Test::class).all {
+        testLogging {
+            showStandardStreams = true
+            showExceptions = true
+            exceptionFormat =
+                org
+                    .gradle
+                    .api
+                    .tasks
+                    .testing
+                    .logging
+                    .TestExceptionFormat
+                    .FULL
+        }
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -145,15 +145,15 @@ 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
@@ -202,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" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

language-server/build.gradle.kts

@@ -1,4 +1,8 @@
 plugins {
     id("org.jetbrains.kotlin.jvm") version "1.8.22"
     id("com.strumenta.kolasu.language-server-plugin") version "1.0.0"
-}
+}
+
+dependencies {
+    testImplementation(kotlin("test"))
+}

language-server/src/test/kotlin/com/strumenta/kuki/TestLanguageServer.kt

@@ -2,14 +2,21 @@ import com.strumenta.kolasu.languageserver.testing.TestKolasuServer
 import com.strumenta.kuki.ast.Recipe
 import com.strumenta.kuki.parser.KukiKolasuParser
 import org.eclipse.lsp4j.Position
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.Assertions.*
 import java.io.File
-import java.nio.file.Paths
+import kotlin.test.Ignore
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+private val cwd = File("").absoluteFile
+private val examplesDirectory = File(cwd.parent, "examples")
+private val File.uriString
+    get() = this.toPath().toUri().toString()
 
 class TestAST : TestKolasuServer<Recipe>(KukiKolasuParser(), language = "kuki", fileExtensions = listOf("kuki")) {
-    private var example = Paths.get("..", "examples", "Almond cookies.kuki").toUri().toString()
-    private val code = File(Paths.get("..", "examples", "Almond cookies.kuki").toUri()).readText()
+    private var example = File(examplesDirectory, "Almond cookies.kuki").uriString
+    private val code = File(examplesDirectory, "Almond cookies.kuki").readText()
+
     @Test
     fun testLanguageServer() {
         expectDiagnostics(0)

settings.gradle.kts

@@ -1,3 +1,3 @@
 rootProject.name = "kuki"
 
-include("ast", "language-server")
+include("ast", "language-server")