diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index cbb5c24..64fbb4d 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -9,13 +9,12 @@ env: jobs: build-bld-project: + runs-on: ubuntu-latest + strategy: matrix: java-version: [17, 21, 24] kotlin-version: [1.9.25, 2.1.20] - os: [ ubuntu-latest, windows-latest, macos-latest ] - - runs-on: ${{ matrix.os }} steps: - name: Checkout source repository @@ -29,24 +28,6 @@ jobs: distribution: "zulu" java-version: ${{ matrix.java-version }} - - name: Download dependencies [bld example] - working-directory: examples/bld - run: ./bld download - - - name: Compile and run examples [bld examples] - working-directory: examples/bld - run: | - ./bld compile - ./bld run --args='https://www.example.com https://is.gd/Pt2sET' - ./bld run-java --args='https://www.example.com https://is.gd/Pt2sET' - - - name: Run examples [gradle examples] - working-directory: examples/gradle - if: matrix.java-version != '24' - run: | - ./gradlew run --args='https://www.example.com https://is.gd/Pt2sET' - ./gradlew runJava --args='https://www.example.com https://is.gd/Pt2sET' - - name: Download dependencies run: ./bld download @@ -58,13 +39,11 @@ jobs: - name: Remove pom.xml if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.kotlin-version == env.COVERAGE_KOTLIN - && matrix.os == 'unbuntu-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 == 'unbuntu-latest' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 94f28ea..1e01b48 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -4,6 +4,5 @@ - \ No newline at end of file diff --git a/examples/bld/src/bld/java/com/example/ExampleBuild.java b/examples/bld/src/bld/java/com/example/ExampleBuild.java index 172466e..e43a7d4 100644 --- a/examples/bld/src/bld/java/com/example/ExampleBuild.java +++ b/examples/bld/src/bld/java/com/example/ExampleBuild.java @@ -24,7 +24,7 @@ public class ExampleBuild extends BaseProject { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY); scope(compile) - .include(dependency("net.thauvin.erik:isgd-shorten:1.1.1-SNAPSHOT")); + .include(dependency("net.thauvin.erik:isgd-shorten:1.1.0")); } public static void main(String[] args) { diff --git a/examples/gradle/build.gradle.kts b/examples/gradle/build.gradle.kts index 989a94e..4154822 100644 --- a/examples/gradle/build.gradle.kts +++ b/examples/gradle/build.gradle.kts @@ -13,7 +13,7 @@ repositories { } dependencies { - implementation("net.thauvin.erik:isgd-shorten:1.1.1-SNAPSHOT") + implementation("net.thauvin.erik:isgd-shorten:1.1.0") } java {