Merge pull request #855 from aSemy/fix/854-update-build-config

#854 update projects to use new Kotlin Multiplatform Gradle plugin

.github/workflows/gradle.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false # in case one JDK fails, we still want to see results from others
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup Gradle Dependencies Cache
         uses: actions/cache@v3
@@ -37,15 +37,20 @@ jobs:
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
 
       - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: temurin
           java-version: ${{ matrix.java-version }}
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+
       - name: Run tests with Gradle
         uses: eskatos/gradle-command-action@v1
         with:
-          arguments: test --stacktrace -Pkotlin.version=${{ matrix.kotlin-version }} -Pkotlin.ir.enabled=${{ matrix.kotlin-ir-enabled }}
+          arguments: |
+            test 
+            --stacktrace 
+            -Pkotlin.version=${{ matrix.kotlin-version }} 
+            -Pkotlin.ir.enabled=${{ matrix.kotlin-ir-enabled }}
+            -PjavaToolchainTestVersion=${{ matrix.java-version }}
 
   android-instrumented-tests:
     runs-on: macos-latest
@@ -55,11 +60,12 @@ jobs:
       fail-fast: false # in case one API-level fails, we still want to see results from others
     timeout-minutes: 30
     steps:
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: '11'
-      - uses: actions/checkout@v2
+          distribution: adopt
+          java-version: 11
 
       - name: Setup Gradle Dependencies Cache
         uses: actions/cache@v3

.gitignore

@@ -1,16 +1,18 @@
-.idea
+.idea/
 .cxx
-out
+
+out/
+build/
+
+.gradle/
+
 *.iml
-.gradle
-build
 hs_err_*
 replay_*
 agent/android/.externalNativeBuild/
 matrix/results
 local.properties
-/mockk-js/node_modules
-/cloud-badge/credentials.json
-/cloud-badge/node_modules/
-/cloud-badge/package-lock.json
-.java-version
+mockk-js/node_modules/
+cloud-badge/credentials.json
+cloud-badge/node_modules/
+cloud-badge/package-lock.json

MAINTAINING.md

@@ -28,4 +28,3 @@
  - [ ] push to github
  - [ ] create github release based on tag and describe changes there
  - [ ] announce on reddit/kotlinlang/potentially at "announcement place" on mockk.io
-

build.gradle.kts

@@ -0,0 +1,30 @@
+import buildsrc.config.excludeGeneratedGradleDslAccessors
+
+plugins {
+    base
+    org.jetbrains.kotlinx.`binary-compatibility-validator`
+    org.jetbrains.kotlinx.kover
+    idea
+
+    // note: plugin versions are set in ./buildSrc/build.gradle.kts
+}
+
+group = "io.mockk"
+
+tasks.wrapper {
+    gradleVersion = "7.5.1"
+    distributionType = Wrapper.DistributionType.ALL
+}
+
+idea {
+    module {
+        isDownloadSources = true
+        isDownloadJavadoc = true
+
+        excludeGeneratedGradleDslAccessors(layout)
+        excludeDirs = excludeDirs + layout.files(
+            ".idea",
+            "gradle/wrapper",
+        )
+    }
+}