diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index b5a8fee..dd17a9c 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -5,14 +5,13 @@ on: [ push, pull_request, workflow_dispatch ] env: BITLY_ACCESS_TOKEN: ${{ secrets.BITLY_ACCESS_TOKEN }} COVERAGE_JDK: "21" - COVERAGE_KOTLIN: "2.0.21" + KOTLIN_VERSION: "2.2.0" jobs: build-bld-project: strategy: matrix: java-version: [ 17, 21, 24 ] - kotlin-version: [ 1.9.25, 2.0.21, 2.1.21 ] os: [ ubuntu-latest, windows-latest, macos-latest ] runs-on: ${{ matrix.os }} @@ -23,12 +22,17 @@ jobs: with: fetch-depth: 0 - - name: Set up JDK ${{ matrix.java-version }} with Kotlin ${{ matrix.kotlin-version }} + - name: Set up JDK ${{ matrix.java-version }} uses: actions/setup-java@v4 with: distribution: "zulu" java-version: ${{ matrix.java-version }} + - name: Setup Kotlin ${{ env.KOTLIN_VERSION }} + uses: fwilhe2/setup-kotlin@main + with: + version: ${{ env.KOTLIN_VERSION }} + - name: Download dependencies [bld example] working-directory: examples/bld run: ./bld download @@ -58,14 +62,12 @@ jobs: run: ./bld jacoco - name: Remove pom.xml - if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.kotlin-version == env.COVERAGE_KOTLIN - && matrix.os == 'ubuntu-latest' + if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.os == 'ubuntu-latest' run: rm -rf pom.xml - name: SonarCloud Scan - uses: sonarsource/sonarcloud-github-action@master - if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.kotlin-version == env.COVERAGE_KOTLIN - && matrix.os == 'ubuntu-latest' + uses: SonarSource/sonarqube-scan-action@v5.2.0 + if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.os == 'ubuntu-latest' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 43546f2..9fc28bd 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -11,6 +11,6 @@