From eaaba5e18f91cfa27773b4fe8564909a6c5e4348 Mon Sep 17 00:00:00 2001
From: Dietrich Pfeifle <dd@dedee.de>
Date: Fri, 12 May 2023 06:58:51 +0200
Subject: [PATCH 1/4] Build matrix

---
 .github/workflows/build.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dde8414..9333cdf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,17 +3,21 @@ name: Build
 
 on: [push]
 
+
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ macos-latest, windows-latest, ubuntu-latest ]
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11 for x64
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           java-version: '11'
           distribution: 'adopt'
-          architecture: x64
+          #architecture: x64
       - name: Build
         uses: gradle/gradle-build-action@v2
         with:

From d34443847cf2765410e18c18504b270c9969994a Mon Sep 17 00:00:00 2001
From: Dietrich Pfeifle <dd@dedee.de>
Date: Fri, 12 May 2023 07:11:53 +0200
Subject: [PATCH 2/4] Build matrix

---
 kompack-base/build.gradle                 | 2 +-
 kompack-kotlin-serialization/build.gradle | 2 +-
 testsuite/build.gradle                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kompack-base/build.gradle b/kompack-base/build.gradle
index fdf9942..44de373 100644
--- a/kompack-base/build.gradle
+++ b/kompack-base/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 kotlin {
     jvm {
-        jvmToolchain(8) // Java8 minimum ok?
+       // take what u get jvmToolchain(11) // Java8 minimum ok?
         withJava()
         testRuns["test"].executionTask.configure {
             useJUnitPlatform()
diff --git a/kompack-kotlin-serialization/build.gradle b/kompack-kotlin-serialization/build.gradle
index dcf07df..5e3a756 100644
--- a/kompack-kotlin-serialization/build.gradle
+++ b/kompack-kotlin-serialization/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 kotlin {
     jvm {
-        jvmToolchain(8) // Java8 minimum ok?
+        // take what you get jvmToolchain(11) // Java8 minimum ok?
         withJava()
         testRuns["test"].executionTask.configure {
             useJUnitPlatform()
diff --git a/testsuite/build.gradle b/testsuite/build.gradle
index fe32855..4d496ba 100644
--- a/testsuite/build.gradle
+++ b/testsuite/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 kotlin {
     jvm {
-        jvmToolchain(8) // Java8 minimum ok?
+      //  jvmToolchain(8) // Java8 minimum ok?
         withJava()
         testRuns["test"].executionTask.configure {
             useJUnitPlatform()

From 4fc5ea03038124e00557cd5a533df64f9192d4fe Mon Sep 17 00:00:00 2001
From: Dietrich Pfeifle <dd@dedee.de>
Date: Fri, 12 May 2023 22:08:07 +0200
Subject: [PATCH 3/4] Build matrix2

---
 .github/workflows/build.yml | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9333cdf..a369745 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,24 +1,39 @@
-
 name: Build
 
-on: [push]
+on:
+
+  push:
+    branches: [ "main" ]
 
+  pull_request:
+    branches: [ "main" ]
 
 jobs:
+
   build:
-    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macos-latest, windows-latest, ubuntu-latest ]
+        config: [
+          { target: android, os: ubuntu-latest, tasks: testDebugUnitTest testReleaseUnitTest, continueOnError: false },
+          { target: apple, os: macos-latest, tasks: iosX64Test iosSimulatorArm64Test macosX64Test macosArm64Test tvosX64Test tvosSimulatorArm64Test watchosX64Test watchosSimulatorArm64Test, continueOnError: false },
+          { target: windows, os: windows-latest, tasks: windowsTest, continueOnError: false },
+          { target: linux, os: ubuntu-latest, tasks: linuxTest, continueOnError: false }
+        ]
+    runs-on: ${{ matrix.config.os }}
+    name: Build ${{ matrix.config.target }}
+
     steps:
       - uses: actions/checkout@v3
+
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
-          distribution: 'adopt'
-          #architecture: x64
+          java-version: '17'
+          distribution: 'temurin'
+
       - name: Build
         uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build test
+
+      - name: Test ${{ matrix.config.target }} targets
+        continue-on-error: ${{ matrix.config.continueOnError }}
+        run: ./gradlew ${{ matrix.config.tasks }}
\ No newline at end of file

From 11499d965966b111f1206ce8c881403702d3a303 Mon Sep 17 00:00:00 2001
From: Dietrich Pfeifle <dd@dedee.de>
Date: Fri, 12 May 2023 22:20:23 +0200
Subject: [PATCH 4/4] Build matrix2

---
 .github/workflows/build.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a369745..f1dd68f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,10 @@ jobs:
 
       - name: Build
         uses: gradle/gradle-build-action@v2
+        #continue-on-error: ${{ matrix.config.continueOnError }}
+        with:
+          arguments: build test
 
-      - name: Test ${{ matrix.config.target }} targets
-        continue-on-error: ${{ matrix.config.continueOnError }}
-        run: ./gradlew ${{ matrix.config.tasks }}
\ No newline at end of file
+      #- name: Test ${{ matrix.config.target }} targets
+      #  continue-on-error: ${{ matrix.config.continueOnError }}
+      #  run: ./gradlew ${{ matrix.config.tasks }}