diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..6fff16c --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: monthly diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 98fcc9f..12df10e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - task: [check, compatTestJava8, compatTestJava11, compatTestJava17, compatTestJava21] + task: [check, compatTestJava8, compatTestJava21] fail-fast: false timeout-minutes: 60 steps: @@ -26,9 +26,7 @@ jobs: distribution: temurin java-version: | 8 - 11 21 - 17 - name: Validate Gradle Wrapper uses: gradle/actions/wrapper-validation@v4 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ab3fab5..ce3f79d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -17,9 +17,7 @@ jobs: distribution: temurin java-version: | 8 - 11 21 - 17 - name: Validate Gradle Wrapper uses: gradle/actions/wrapper-validation@v4 diff --git a/build.gradle.kts b/build.gradle.kts index 82464f6..4f4dacb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,23 +41,7 @@ stutter { languageVersion.set(JavaLanguageVersion.of(8)) } gradleVersions { - compatibleRange("6.4") - } - } - val java11 by matrices.creating { - javaToolchain { - languageVersion.set(JavaLanguageVersion.of(11)) - } - gradleVersions { - compatibleRange("6.4") - } - } - val java17 by matrices.creating { - javaToolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } - gradleVersions { - compatibleRange("7.3") + compatibleRange("8.0") } } val java21 by matrices.creating { @@ -65,7 +49,7 @@ stutter { languageVersion.set(JavaLanguageVersion.of(21)) } gradleVersions { - compatibleRange("8.5") + compatibleRange("8.6") } } } diff --git a/manual-test/build.gradle b/manual-test/build.gradle index 1073a16..63f86a4 100644 --- a/manual-test/build.gradle +++ b/manual-test/build.gradle @@ -31,13 +31,15 @@ dependencies { // frontend implementation 're-frame:re-frame:1.4.3' + implementation 'cljsjs:react:18.3.1-1' + implementation 'cljsjs:react-dom:18.3.1-1' // component implementation 'com.stuartsierra:component:1.1.0' devImplementation 'com.stuartsierra:component.repl:1.0.0' // clojurescript repl - devImplementation('dev.clojurephant:clojurephant-tooling:0.1.0-rc.2') { + devImplementation('dev.clojurephant:clojurephant-tooling:0.1.0') { capabilities { requireCapabilities('dev.clojurephant:clojurephant-tooling-figwheel-main') } diff --git a/src/main/java/dev/clojurephant/plugin/common/internal/ClojureCommonPlugin.java b/src/main/java/dev/clojurephant/plugin/common/internal/ClojureCommonPlugin.java index 7b6c61a..b6c388f 100644 --- a/src/main/java/dev/clojurephant/plugin/common/internal/ClojureCommonPlugin.java +++ b/src/main/java/dev/clojurephant/plugin/common/internal/ClojureCommonPlugin.java @@ -12,7 +12,6 @@ import org.gradle.api.JavaVersion; import org.gradle.api.Plugin; import org.gradle.api.Project; -import org.gradle.api.artifacts.ComponentModuleMetadataDetails; import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.component.ComponentIdentifier; import org.gradle.api.artifacts.dsl.DependencyHandler; @@ -101,8 +100,7 @@ private void configureDev(Project project, SourceSetContainer sourceSets) { } private void configureDependencyConstraints(DependencyHandler dependencies) { - dependencies.getModules().module("org.clojure:tools.nrepl", module -> { - ComponentModuleMetadataDetails details = (ComponentModuleMetadataDetails) module; + dependencies.getModules().module("org.clojure:tools.nrepl", details -> { details.replacedBy("nrepl:nrepl", "nREPL was moved out of Clojure Contrib to its own project."); }); @@ -129,6 +127,7 @@ private Provider enrichClasspath(Project project, Configuration .map(result -> result.getSelected().getId()) .collect(Collectors.toSet()); + @SuppressWarnings("unchecked") ArtifactResolutionResult result = project.getDependencies().createArtifactResolutionQuery() .forComponents(componentIds) .withArtifacts(JvmLibrary.class, SourcesArtifact.class, JavadocArtifact.class) diff --git a/stutter.lockfile b/stutter.lockfile index 90fbc34..2b50511 100644 --- a/stutter.lockfile +++ b/stutter.lockfile @@ -1,5 +1,3 @@ # DO NOT MODIFY: Generated by Stutter plugin. -java11=6.4.1,6.9.4,7.0.2,7.6.4,8.0.2,8.13,8.14-rc-1,9.0-milestone-1 -java17=7.3.3,7.6.4,8.0.2,8.13,8.14-rc-1,9.0-milestone-1 -java21=8.5,8.13,8.14-rc-1,9.0-milestone-1 -java8=6.4.1,6.9.4,7.0.2,7.6.4,8.0.2,8.13,8.14-rc-1,9.0-milestone-1 +java21=8.6,8.13,8.14-rc-2,9.0-milestone-2 +java8=8.0.2,8.13,8.14-rc-2,9.0-milestone-2