diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml index 1bf8d440cbe..186dc051852 100644 --- a/.github/workflows/PR.yml +++ b/.github/workflows/PR.yml @@ -25,13 +25,13 @@ jobs: with: java-version: '8' - - name: Run ubuntu tests + - name: Run Ubuntu tests if: matrix.os == 'ubuntu-latest' run: ./gradlew check --scan - - name: Run windows tests + - name: Run Windows tests if: matrix.os == 'windows-latest' - run: ./gradlew mingwX64Test --scan + run: ./gradlew mingwX64Test mingwX86Test --scan - name: Run macOS tests if: matrix.os == 'macOS-latest' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a56b0738522..706646885c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,7 +78,7 @@ jobs: fetch-depth: 0 - name: Run tests - run: ./gradlew mingwX64Test --scan + run: ./gradlew mingwX64Test mingwX86Test --scan - name: Bundle the build report if: failure() diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index f503180b51f..efddd4e08f5 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -67,7 +67,7 @@ jobs: run: ./gradlew watchosArm32TestKlibrary watchosArm64TestKlibrary watchosX86Test watchosX64Test watchosX86Test --scan - name: publish macos snapshots - run: ./gradlew publishMacosX64PublicationToDeployRepository + run: ./gradlew publishMacosX64PublicationToDeployRepository publishMacosArm64PublicationToDeployRepository env: OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} @@ -118,10 +118,10 @@ jobs: fetch-depth: 0 - name: Run tests - run: ./gradlew mingwX64Test --scan + run: ./gradlew mingwX64Test mingwX86Test --scan - - name: publish mingw64 snapshot - run: ./gradlew publishMingwX64PublicationToDeployRepository + - name: publish mingw64 and mingw86 snapshot + run: ./gradlew publishMingwX64PublicationToDeployRepository publishMingwX86PublicationToDeployRepository env: OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} diff --git a/.github/workflows/release_all.yml b/.github/workflows/release_all.yml index 0f7791eb67b..74e14b476d8 100644 --- a/.github/workflows/release_all.yml +++ b/.github/workflows/release_all.yml @@ -54,7 +54,7 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} - - name: publish linux release + - name: publish linux x64 release run: ./gradlew publishLinuxX64PublicationToDeployRepository env: RELEASE_VERSION: ${{ github.event.inputs.version }} @@ -63,6 +63,15 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} + - name: publish linux Arm64 release + run: ./gradlew publishLinuxArm64PublicationToDeployRepository + env: + RELEASE_VERSION: ${{ github.event.inputs.version }} + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} + publish_macos: runs-on: macos-latest needs: publish_linux @@ -88,6 +97,15 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} + - name: publish macosArm64 release + run: ./gradlew publishMacosArm64PublicationToDeployRepository + env: + RELEASE_VERSION: ${{ github.event.inputs.version }} + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} + - name: publish tvosX64 release run: ./gradlew publishTvosX64PublicationToDeployRepository env: @@ -186,7 +204,7 @@ jobs: java-version: '8' - name: deploy to sonatype - run: ./gradlew publishMingwX64PublicationToDeployRepository + run: ./gradlew publishMingwX64PublicationToDeployRepository publishMingwX86PublicationToDeployRepository env: RELEASE_VERSION: ${{ github.event.inputs.version }} OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml index 6f3a8d5539d..345fd8e592e 100644 --- a/.github/workflows/release_linux.yml +++ b/.github/workflows/release_linux.yml @@ -54,7 +54,7 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} - - name: publish linux release + - name: publish linux x64 release run: ./gradlew publishLinuxX64PublicationToDeployRepository env: RELEASE_VERSION: ${{ github.event.inputs.version }} @@ -63,5 +63,14 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} + - name: publish linux Arm64 release + run: ./gradlew publishLinuxArm64PublicationToDeployRepository + env: + RELEASE_VERSION: ${{ github.event.inputs.version }} + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} + env: GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=false -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8" diff --git a/.github/workflows/release_macos.yml b/.github/workflows/release_macos.yml index e6636bd9d6d..d35ca1228de 100644 --- a/.github/workflows/release_macos.yml +++ b/.github/workflows/release_macos.yml @@ -36,6 +36,15 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} + - name: publish macosArm64 release + run: ./gradlew publishMacosArm64PublicationToDeployRepository + env: + RELEASE_VERSION: ${{ github.event.inputs.version }} + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} + - name: publish tvosX64 release run: ./gradlew publishTvosX64PublicationToDeployRepository env: diff --git a/.github/workflows/release_windows.yml b/.github/workflows/release_windows.yml index 70543beb41b..bbfb2240184 100644 --- a/.github/workflows/release_windows.yml +++ b/.github/workflows/release_windows.yml @@ -28,7 +28,7 @@ jobs: java-version: '8' - name: deploy to sonatype - run: ./gradlew publishMingwX64PublicationToDeployRepository + run: ./gradlew publishMingwX64PublicationToDeployRepository publishMingwX86PublicationToDeployRepository env: RELEASE_VERSION: ${{ github.event.inputs.version }} OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} diff --git a/kotest-assertions/kotest-assertions-api/build.gradle.kts b/kotest-assertions/kotest-assertions-api/build.gradle.kts index da61c397f8c..cb85775f892 100644 --- a/kotest-assertions/kotest-assertions-api/build.gradle.kts +++ b/kotest-assertions/kotest-assertions-api/build.gradle.kts @@ -25,10 +25,14 @@ kotlin { } linuxX64() + linuxArm64() mingwX64() + mingwX86() macosX64() + macosArm64() + tvos() watchosArm32() diff --git a/kotest-assertions/kotest-assertions-core/build.gradle.kts b/kotest-assertions/kotest-assertions-core/build.gradle.kts index 2c10aca15e4..934b628cc04 100644 --- a/kotest-assertions/kotest-assertions-core/build.gradle.kts +++ b/kotest-assertions/kotest-assertions-core/build.gradle.kts @@ -25,15 +25,21 @@ kotlin { } linuxX64() + linuxArm64() mingwX64() + mingwX86() macosX64() + macosArm64() + tvos() + watchosArm32() watchosArm64() watchosX86() watchosX64() + iosX64() iosArm64() iosArm32() diff --git a/kotest-assertions/kotest-assertions-shared/build.gradle.kts b/kotest-assertions/kotest-assertions-shared/build.gradle.kts index 1ace6869803..b35f1f9b204 100644 --- a/kotest-assertions/kotest-assertions-shared/build.gradle.kts +++ b/kotest-assertions/kotest-assertions-shared/build.gradle.kts @@ -27,10 +27,14 @@ kotlin { } linuxX64() + linuxArm64() mingwX64() + mingwX86() macosX64() + macosArm64() + tvos() watchosArm32() @@ -79,14 +83,26 @@ kotlin { dependsOn(desktopMain) } + val macosArm64Main by getting { + dependsOn(desktopMain) + } + val mingwX64Main by getting { dependsOn(desktopMain) } + val mingwX86Main by getting { + dependsOn(desktopMain) + } + val linuxX64Main by getting { dependsOn(desktopMain) } + val linuxArm64Main by getting { + dependsOn(desktopMain) + } + val iosX64Main by getting { dependsOn(desktopMain) } diff --git a/kotest-common/build.gradle.kts b/kotest-common/build.gradle.kts index 02615a1fe6c..b34b6bfbbb1 100644 --- a/kotest-common/build.gradle.kts +++ b/kotest-common/build.gradle.kts @@ -25,10 +25,14 @@ kotlin { } linuxX64() + linuxArm64() mingwX64() + mingwX86() macosX64() + macosArm64() + tvos() watchosArm32() @@ -65,14 +69,26 @@ kotlin { dependsOn(desktopMain) } + val macosArm64Main by getting { + dependsOn(desktopMain) + } + val mingwX64Main by getting { dependsOn(desktopMain) } + val mingwX86Main by getting { + dependsOn(desktopMain) + } + val linuxX64Main by getting { dependsOn(desktopMain) } + val linuxArm64Main by getting { + dependsOn(desktopMain) + } + val iosX64Main by getting { dependsOn(desktopMain) } @@ -85,15 +101,15 @@ kotlin { dependsOn(desktopMain) } - val watchosX86Main by getting { + val watchosArm32Main by getting { dependsOn(desktopMain) } - val watchosArm32Main by getting { + val watchosArm64Main by getting { dependsOn(desktopMain) } - val watchosArm64Main by getting { + val watchosX86Main by getting { dependsOn(desktopMain) } diff --git a/kotest-framework/kotest-framework-api/build.gradle.kts b/kotest-framework/kotest-framework-api/build.gradle.kts index db6c714dc4f..3585ff1375f 100644 --- a/kotest-framework/kotest-framework-api/build.gradle.kts +++ b/kotest-framework/kotest-framework-api/build.gradle.kts @@ -27,10 +27,14 @@ kotlin { } linuxX64() + linuxArm64() mingwX64() + mingwX86() macosX64() + macosArm64() + tvos() watchosArm32() @@ -72,14 +76,26 @@ kotlin { dependsOn(desktopMain) } + val macosArm64Main by getting { + dependsOn(desktopMain) + } + val mingwX64Main by getting { dependsOn(desktopMain) } + val mingwX86Main by getting { + dependsOn(desktopMain) + } + val linuxX64Main by getting { dependsOn(desktopMain) } + val linuxArm64Main by getting { + dependsOn(desktopMain) + } + val iosX64Main by getting { dependsOn(desktopMain) } diff --git a/kotest-framework/kotest-framework-engine/build.gradle.kts b/kotest-framework/kotest-framework-engine/build.gradle.kts index 7d97dfae1b3..8530bc1bc2b 100644 --- a/kotest-framework/kotest-framework-engine/build.gradle.kts +++ b/kotest-framework/kotest-framework-engine/build.gradle.kts @@ -38,15 +38,21 @@ kotlin { } linuxX64() + linuxArm64() mingwX64() + mingwX86() macosX64() + macosArm64() + tvos() + watchosArm32() watchosArm64() watchosX86() watchosX64() + iosX64() iosArm64() iosArm32() @@ -111,11 +117,11 @@ kotlin { dependsOn(commonMain) } - val linuxX64Main by getting { + val macosX64Main by getting { dependsOn(desktopMain) } - val macosX64Main by getting { + val macosArm64Main by getting { dependsOn(desktopMain) } @@ -123,6 +129,18 @@ kotlin { dependsOn(desktopMain) } + val mingwX86Main by getting { + dependsOn(desktopMain) + } + + val linuxX64Main by getting { + dependsOn(desktopMain) + } + + val linuxArm64Main by getting { + dependsOn(desktopMain) + } + val iosX64Main by getting { dependsOn(desktopMain) } @@ -135,15 +153,15 @@ kotlin { dependsOn(desktopMain) } - val watchosX86Main by getting { + val watchosArm32Main by getting { dependsOn(desktopMain) } - val watchosArm32Main by getting { + val watchosArm64Main by getting { dependsOn(desktopMain) } - val watchosArm64Main by getting { + val watchosX86Main by getting { dependsOn(desktopMain) } diff --git a/kotest-property/build.gradle.kts b/kotest-property/build.gradle.kts index 41e9336f3f2..240900960c4 100644 --- a/kotest-property/build.gradle.kts +++ b/kotest-property/build.gradle.kts @@ -27,10 +27,14 @@ kotlin { } linuxX64() + linuxArm64() mingwX64() + mingwX86() macosX64() + macosArm64() + tvos() watchosArm32() @@ -85,14 +89,26 @@ kotlin { dependsOn(desktopMain) } + val macosArm64Main by getting { + dependsOn(desktopMain) + } + val mingwX64Main by getting { dependsOn(desktopMain) } + val mingwX86Main by getting { + dependsOn(desktopMain) + } + val linuxX64Main by getting { dependsOn(desktopMain) } + val linuxArm64Main by getting { + dependsOn(desktopMain) + } + val iosX64Main by getting { dependsOn(desktopMain) } diff --git a/kotest-tests/kotest-tests-native/build.gradle.kts b/kotest-tests/kotest-tests-native/build.gradle.kts index 150f994f510..1efe7a193e7 100644 --- a/kotest-tests/kotest-tests-native/build.gradle.kts +++ b/kotest-tests/kotest-tests-native/build.gradle.kts @@ -9,9 +9,21 @@ repositories { kotlin { targets { linuxX64() + linuxArm64() + mingwX64() + mingwX86() + macosX64() + macosArm64() + tvos() + + watchosArm32() + watchosArm64() + watchosX86() + watchosX64() + iosX64() iosArm64() iosArm32() @@ -35,14 +47,26 @@ kotlin { dependsOn(nativeTest) } + val macosArm64Test by getting { + dependsOn(nativeTest) + } + val mingwX64Test by getting { dependsOn(nativeTest) } + val mingwX86Test by getting { + dependsOn(nativeTest) + } + val linuxX64Test by getting { dependsOn(nativeTest) } + val linuxArm64Test by getting { + dependsOn(nativeTest) + } + val iosX64Test by getting { dependsOn(nativeTest) } @@ -55,6 +79,22 @@ kotlin { dependsOn(nativeTest) } + val watchosArm32Test by getting { + dependsOn(nativeTest) + } + + val watchosArm64Test by getting { + dependsOn(nativeTest) + } + + val watchosX86Test by getting { + dependsOn(nativeTest) + } + + val watchosX64Test by getting { + dependsOn(nativeTest) + } + val tvosTest by getting { dependsOn(nativeTest) }