diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a7a155f1..b780d3d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: repository_id: ${{ steps.create.outputs.repository_id }} steps: - id: create - uses: nexus-actions/create-nexus-staging-repo@main + uses: nexus-actions/create-nexus-staging-repo@990063f02160c633c168037b8b3e8585c76469fe #v1.3 with: base_url: https://s01.oss.sonatype.org/service/local/ username: ${{ secrets.SONATYPE_USERNAME }} @@ -22,18 +22,15 @@ jobs: build-upload: needs: create-staging-repository - runs-on: ${{ matrix.os }} + runs-on: macOS-latest env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} GPG_PRIVATE_KEY: ${{ secrets.PGP_SIGNING_KEY }} GPG_PRIVATE_PASSWORD: ${{ secrets.PGP_SIGNING_PASSWORD }} - strategy: - matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3 + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 #v3 - name: Cached Konan uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 #v3 with: @@ -47,30 +44,17 @@ jobs: with: java-version: 17 distribution: 'temurin' - # Host only for MacOS / Windows - - name: Check (macos / windows) - if: matrix.os != 'ubuntu-latest' + - name: Check run: ./gradlew hostOnlyTest shell: bash - name: Check Android - if: matrix.os == 'macOS-latest' uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b #v2.28.0 with: api-level: 29 ndk: 21.3.6528147 cmake: 3.10.2.4988404 script: ./gradlew connectedCheck - - name: Upload (macos / windows) - if: matrix.os != 'ubuntu-latest' - run: ./gradlew hostOnlyPublish -Porg.kodein.sonatype.repositoryId=${{ needs.create-staging-repository.outputs.repository_id }} - shell: bash - # Linux / JVM / JS - - name: Check (ubuntu) - if: matrix.os == 'ubuntu-latest' - run: ./gradlew check - shell: bash - - name: Upload (ubuntu) - if: matrix.os == 'ubuntu-latest' + - name: Upload run: ./gradlew publishAllPublicationsToOssrhStagingRepository -Porg.kodein.sonatype.repositoryId=${{ needs.create-staging-repository.outputs.repository_id }} shell: bash @@ -81,7 +65,7 @@ jobs: steps: - name: Discard if: ${{ needs.build-upload.result != 'success' }} - uses: nexus-actions/drop-nexus-staging-repo@fe83783967a063540320ace3c8942608246705a1 #v1 + uses: nexus-actions/drop-nexus-staging-repo@v1 with: base_url: https://s01.oss.sonatype.org/service/local/ username: ${{ secrets.SONATYPE_USERNAME }} @@ -89,7 +73,7 @@ jobs: staging_repository_id: ${{ needs.create-staging-repository.outputs.repository_id }} - name: Release if: ${{ needs.build-upload.result == 'success' }} - uses: nexus-actions/release-nexus-staging-repo@36161f25ef98cc3821eabb11ab742d2e9d479e52 #v1.2 + uses: nexus-actions/release-nexus-staging-repo@v1 with: base_url: https://s01.oss.sonatype.org/service/local/ username: ${{ secrets.SONATYPE_USERNAME }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index c7939a16..c09ea61d 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -19,12 +19,9 @@ env: jobs: build-upload: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] + runs-on: macOS-latest steps: - - name: Check out + - name: Checkout uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 #v3 - name: Cached Konan uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 #v3 @@ -39,29 +36,16 @@ jobs: with: java-version: 17 distribution: 'temurin' - # Host only for MacOS / Windows - - name: Check (macos / windows) - if: matrix.os != 'ubuntu-latest' - run: ./gradlew hostOnlyTest + - name: Check + run: ./gradlew check shell: bash - name: Check Android - if: matrix.os == 'macOS-latest' uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b #v2.28.0 with: api-level: 29 ndk: 21.3.6528147 cmake: 3.10.2.4988404 script: ./gradlew connectedCheck - - name: Upload (macos / windows) - if: matrix.os != 'ubuntu-latest' - run: ./gradlew hostOnlyPublish -PgitRef=${{ github.ref }} -Psnapshot=true - shell: bash - # Linux / JVM / JS - - name: Check (ubuntu) - if: matrix.os == 'ubuntu-latest' - run: ./gradlew check - shell: bash - - name: Upload (ubuntu) - if: matrix.os == 'ubuntu-latest' + - name: Upload run: ./gradlew publishAllPublicationsToOssrhStagingRepository -PgitRef=${{ github.ref }} -Psnapshot=true - shell: bash \ No newline at end of file + shell: bash diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d3f0effa..447348bd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,14 +10,10 @@ on: - '!./github/workflow/test.yml' jobs: - check: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] + runs-on: macOS-latest steps: - - name: Check out + - name: Checkout uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 #v3 - name: Cached Konan uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 #v3 diff --git a/gradle.properties b/gradle.properties index 2923403c..b5b511f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,7 @@ org.gradle.parallel=true # Android android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true + +# Kosi +org.kodein.native.enableCrossCompilation=true \ No newline at end of file