From de4c2a6d098b08d9762febba8eda064d74ec2618 Mon Sep 17 00:00:00 2001 From: Leonardo Colman Date: Thu, 22 Apr 2021 20:05:40 -0300 Subject: [PATCH] Fix build (#1) Currently, due to some issues such as https://youtrack.jetbrains.com/issue/KT-46153, It's only possible to publish artifacts for other platforms (such as Desktop or IOS) if all the dependencies have the specific target as well Currently, Kotest doesn't support IOS (it's a work in progress), and thus this extension can't support it either. This commit removes these targets until we're ready to support them. The only targets left are JVM and JS. --- .github/workflows/master.yml | 63 ------------ .github/workflows/release.yml | 99 ------------------- build.gradle.kts | 37 ------- .../kotlin/io.kotest.koin}/KoinExtension.kt | 0 4 files changed, 199 deletions(-) rename src/{jvmMain/kotlin/io/kotest/koin => commonMain/kotlin/io.kotest.koin}/KoinExtension.kt (100%) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 6ec8031..6701c44 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -44,68 +44,5 @@ jobs: name: error-report path: build-reports.zip - macos: - runs-on: macOS-latest - steps: - - name: Checkout the repo - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Run macos tests - run: ./gradlew macosX64Test --scan - - - name: Run ios tests - run: ./gradlew iosX64Test --scan - - - name: Run tvos tests - run: ./gradlew tvosX64Test --scan - - # - name: Run watchos tests - # run: ./gradlew watchosX64Test --scan - - - name: publish macos snapshots - run: ./gradlew publishMacosX64PublicationToDeployRepository - env: - 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 ios snapshots - run: ./gradlew publishIosX64PublicationToDeployRepository publishIosArm64PublicationToDeployRepository publishIosArm32PublicationToDeployRepository - env: - 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 watchos snapshots - # run: ./gradlew publishWatchosX64PublicationToDeployRepository publishWatchosArm64PublicationToDeployRepository - # env: - # 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 tvos snapshots - run: ./gradlew publishTvosX64PublicationToDeployRepository publishTvosArm64PublicationToDeployRepository - env: - 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: Bundle the build report - if: failure() - run: find . -type d -name 'reports' | zip -@ -r build-reports.zip - - - name: Upload the build report - if: failure() - uses: actions/upload-artifact@master - with: - name: error-report - path: build-reports.zip - 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.yml b/.github/workflows/release.yml index a91aaac..bf4cd7b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,97 +13,6 @@ on: jobs: - publish_macos: - runs-on: macOS-latest - - steps: - - name: Checkout the repo - uses: actions/checkout@v2 - with: - fetch-depth: 0 - ref: ${{ github.event.inputs.branch }} - - - name: publish macosx64 release - run: ./gradlew publishMacosX64PublicationToDeployRepository - 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: - 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 tvosArm64 release - run: ./gradlew publishTvosArm64PublicationToDeployRepository - 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 watchosX64 release - # run: ./gradlew publishWatchosX64PublicationToDeployRepository - # 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 watchosArm32 release -# run: ./gradlew publishWatchosArm32PublicationToDeployRepository -# 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 watchosArm64 release -# run: ./gradlew publishWatchosArm64PublicationToDeployRepository -# 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 iosX64 release - run: ./gradlew publishIosX64PublicationToDeployRepository - 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 iosArm64 release - run: ./gradlew publishIosArm64PublicationToDeployRepository - 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 iosArm32 release - run: ./gradlew publishIosArm32PublicationToDeployRepository - 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_linux_and_common: runs-on: ubuntu-latest @@ -141,14 +50,6 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} - - name: publish linux release - run: ./gradlew publishLinuxX64PublicationToDeployRepository - 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/build.gradle.kts b/build.gradle.kts index 64d2ac4..37618e4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -49,15 +49,6 @@ kotlin { browser() nodejs() } - - linuxX64() - - macosX64() - tvos() - - iosX64() - iosArm64() - iosArm32() } sourceSets { @@ -87,34 +78,6 @@ kotlin { } } - val desktopMain by creating { - dependsOn(commonMain) - } - - val macosX64Main by getting { - dependsOn(desktopMain) - } - - val linuxX64Main by getting { - dependsOn(desktopMain) - } - - val iosX64Main by getting { - dependsOn(desktopMain) - } - - val iosArm64Main by getting { - dependsOn(desktopMain) - } - - val iosArm32Main by getting { - dependsOn(desktopMain) - } - - val tvosMain by getting { - dependsOn(desktopMain) - } - all { languageSettings.useExperimentalAnnotation("kotlin.time.ExperimentalTime") languageSettings.useExperimentalAnnotation("kotlin.experimental.ExperimentalTypeInference") diff --git a/src/jvmMain/kotlin/io/kotest/koin/KoinExtension.kt b/src/commonMain/kotlin/io.kotest.koin/KoinExtension.kt similarity index 100% rename from src/jvmMain/kotlin/io/kotest/koin/KoinExtension.kt rename to src/commonMain/kotlin/io.kotest.koin/KoinExtension.kt