diff --git a/.circleci/config.yml b/.circleci/config.yml.bak similarity index 100% rename from .circleci/config.yml rename to .circleci/config.yml.bak diff --git a/.github/workflows/TEST.yml b/.github/workflows/TEST.yml new file mode 100644 index 0000000000..a0fdda2c03 --- /dev/null +++ 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 index e2b10e3100..f9edd1fc05 100644 --- 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/zircon.core/src/commonMain/kotlin/org/hexworks/zircon/internal/application/BaseApplication.kt b/zircon.core/src/commonMain/kotlin/org/hexworks/zircon/internal/application/BaseApplication.kt index 1c0227e83c..28baac3284 100644 --- a/zircon.core/src/commonMain/kotlin/org/hexworks/zircon/internal/application/BaseApplication.kt +++ b/zircon.core/src/commonMain/kotlin/org/hexworks/zircon/internal/application/BaseApplication.kt @@ -74,7 +74,7 @@ abstract class BaseApplication( delay(renderIntervalMs - elapsedTimeMs) } } catch (e: Exception) { - logger.error(e) { "Render failed" } + logger.error({ "Render failed" }, e) } } }