.github/workflows/gradle.yml

@@ -1,34 +1,22 @@
 name: gradle-ci
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-  workflow_dispatch:
-
-concurrency:
-  group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
-  cancel-in-progress: true
+on: [ push, pull_request, workflow_dispatch ]
 
 jobs:
   build:
-    strategy:
-      matrix:
-        java-version: [ 11, 17, 20 ]
-        os:
-          - macos-latest
-          - ubuntu-latest
-          - windows-latest
-      fail-fast: false
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
+
     env:
       GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m"
 
+    strategy:
+      matrix:
+        java-version: [ 11, 17, 20 ]
+
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v3
@@ -36,19 +24,10 @@ jobs:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
 
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Cache Kotlin Konan
-        id: cache-kotlin-konan
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.konan/**/*
-          key: kotlin-konan-${{ runner.os }}
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
 
       - name: Test with Gradle
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-home-cache-cleanup: true
           arguments: build check --stacktrace -PtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }}

buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-base.gradle.kts

@@ -3,10 +3,7 @@ package buildsrc.conventions.lang
 import buildsrc.utils.Rife2TestListener
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
-
 
 
 /**
@@ -25,7 +22,7 @@ plugins {
 
 
 kotlin {
-    //jvmToolchain(11)
+    jvmToolchain(11)
 
     targets.configureEach {
         compilations.configureEach {
@@ -52,22 +49,11 @@ kotlin {
     }
 }
 
- tasks {
-    withType<JavaCompile>().configureEach {
-        sourceCompatibility = JavaVersion.VERSION_11.toString()
-        targetCompatibility = JavaVersion.VERSION_11.toString()
+tasks.withType<Test>().configureEach {
+    val testsBadgeApiKey = providers.gradleProperty("testsBadgeApiKey")
+    addTestListener(Rife2TestListener(testsBadgeApiKey))
+    testLogging {
+        exceptionFormat = TestExceptionFormat.FULL
+        events = setOf(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
     }
-
-    withType<KotlinJvmCompile>().configureEach {
-        compilerOptions.jvmTarget.set(JvmTarget.JVM_11)
-    }
-
-    withType<Test>().configureEach {
-        val testsBadgeApiKey = providers.gradleProperty("testsBadgeApiKey")
-        addTestListener(Rife2TestListener(testsBadgeApiKey))
-        testLogging {
-            exceptionFormat = TestExceptionFormat.FULL
-            events = setOf(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
-        }
-    }
- }
+}