diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 4b13ef6..11e9263 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -7,10 +7,11 @@ on: branches: [ main ] jobs: - gradle-build: + ci: strategy: matrix: os: [ubuntu, macos, windows] + fail-fast: false runs-on: ${{ matrix.os }}-latest steps: - name: standardize git line endings diff --git a/build.gradle.kts b/build.gradle.kts index a0a7a2f..501ca2f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,8 +15,6 @@ publishingConventions { } } -testingConventions { testGradleVersions("7.4", "7.6.5", "8.0.2", "8.14.2") } - tasks.test { inputs.property("operatingSystemName", System.getProperty("os.name")) inputs.property("operatingSystemArch", System.getProperty("os.arch")) diff --git a/src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingPlugin.java b/src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingPlugin.java index 134abdf..a5a7eaa 100644 --- a/src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingPlugin.java +++ b/src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingPlugin.java @@ -1,13 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 package org.gradlex.javamodule.packaging; -import javax.inject.Inject; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.file.SourceDirectorySet; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.tasks.SourceSetContainer; -import org.gradle.jvm.toolchain.JavaToolchainService; import org.gradle.util.GradleVersion; import org.gradlex.javamodule.packaging.internal.HostIdentification; import org.jspecify.annotations.NullMarked; @@ -15,9 +13,6 @@ @NullMarked public abstract class JavaModulePackagingPlugin implements Plugin { - @Inject - protected abstract JavaToolchainService getJavaToolchains(); - @Override public void apply(Project project) { if (GradleVersion.current().compareTo(GradleVersion.version("7.4")) < 0) {