Merge pull request #424 from Hexworks/add-korge-renderer.fix

Adds github workflows, fixes compilation and jvm version errors
Hexworks · Jan 23, 2024 · 1e3cb53 · 1e3cb53
2 parents 893f26e + 2d46aca
commit 1e3cb53
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/.circleci/config.yml → .circleci/config.yml.bak b/.circleci/config.yml → .circleci/config.yml.bak
diff --git a/.github/workflows/TEST.yml b/.github/workflows/TEST.yml
@@ -0,0 +1,29 @@
+name: TEST
+
+on:
+  push:
+    branches: [ "master", "main" ]
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  CI: true
+  DISPLAY: ":99"
+  JAVA_VERSION: 11
+  JAVA_DISTRIBUTION: zulu
+
+jobs:
+  test:
+    timeout-minutes: 25
+    runs-on: ubuntu-latest
+    steps:
+      - { uses: actions/checkout@v3 }
+      - { name: Set up JDK, uses: actions/setup-java@v3, with: { distribution: "${{ env.JAVA_DISTRIBUTION }}", java-version: "${{ env.JAVA_VERSION }}" } }
+      - { name: Prepare Gradle, uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc } # v2.8.0
+      - { name: Initialize Gradle, run: ./gradlew }
+      - { name: Gradle Test JVM, run: ./gradlew jvmTest }
+      - { name: Gradle Test JS, run: ./gradlew jsTest }
+      #- { name: Gradle Sonarqube, run: ./gradlew sonarqube, if: false }
diff --git a/zircon.core/build.gradle.kts b/zircon.core/build.gradle.kts
@@ -18,6 +18,13 @@ plugins {
     id("signing")
 }
 
+val javaVersion = JavaVersion.VERSION_11
+
+java {
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaVersion
+}
+
 kotlin {
 
     jvm {
@@ -26,7 +33,8 @@ kotlin {
             kotlinOptions {
                 apiVersion = "1.9"
                 languageVersion = "1.9"
-                jvmTarget = "15"
+                jvmTarget = javaVersion.toString()
+
             }
         }
     }

diff --git a/...on.core/src/commonMain/kotlin/org/hexworks/zircon/internal/application/BaseApplication.kt b/...on.core/src/commonMain/kotlin/org/hexworks/zircon/internal/application/BaseApplication.kt
@@ -74,7 +74,7 @@ abstract class BaseApplication<R : Any, A : Application, V>(
                         delay(renderIntervalMs - elapsedTimeMs)
                     }
                 } catch (e: Exception) {
-                    logger.error(e) { "Render failed" }
+                    logger.error({ "Render failed" }, e)
                 }
             }
         }