diff --git a/README.md b/README.md index daac858..66f65cd 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ nebula-clojure-plugin ============== ![Support Status](https://img.shields.io/badge/nebula-active-green.svg) -[![Gradle Plugin Portal](https://img.shields.io/maven-metadata/v/https/plugins.gradle.org/m2/com.netflix.nebula/nebula-clojure-plugin/maven-metadata.xml.svg?label=gradlePluginPortal)](https://plugins.gradle.org/plugin/nebula.clojure) +[![Gradle Plugin Portal](https://img.shields.io/maven-metadata/v/https/plugins.gradle.org/m2/com.netflix.nebula/nebula-clojure-plugin/maven-metadata.xml.svg?label=gradlePluginPortal)](https://plugins.gradle.org/plugin/com.netflix.nebula.clojure) [![Maven Central](https://img.shields.io/maven-central/v/com.netflix.nebula/nebula-clojure-plugin)](https://maven-badges.herokuapp.com/maven-central/com.netflix.nebula/nebula-clojure-plugin) ![Build](https://github.com/nebula-plugins/nebula-clojure-plugin/actions/workflows/nebula.yml/badge.svg) [![MIT](https://img.shields.io/github/license/nebula-plugins/nebula-clojure-plugin.svg)](https://opensource.org/licenses/MIT) @@ -12,7 +12,9 @@ Plugin providing Clojuresque with compatibility fixes for Gradle 8.x # Quick Start -Refer to the [Gradle Plugin Portal](https://plugins.gradle.org/plugin/nebula.clojure) for instructions on how to apply the plugin. +Refer to the [Gradle Plugin Portal](https://plugins.gradle.org/plugin/com.netflix.nebula.clojure) for instructions on how to apply the plugin. + +New releases use only the `com.netflix.nebula.clojure` plugin ID. Builds using the legacy `nebula.clojure` ID must migrate to the new ID when upgrading. # Selecting Clojure tests diff --git a/build.gradle b/build.gradle index 425d358..d1a47b9 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { - id 'com.netflix.nebula.plugin-plugin' version '25.+' + id 'com.netflix.nebula.plugin-plugin' id 'java-gradle-plugin' } @@ -46,19 +46,7 @@ dependencies { gradlePlugin { plugins { - nebulaClojureLegacy { - id = 'nebula.clojure' - displayName = 'Nebula Clojure' - description = project.description - implementationClass = 'nebula.plugin.clojure.NebulaClojurePlugin' - tags.set(['nebula', 'clojure']) - compatibility { - features { - configurationCache = true - } - } - } - nebulaClojure { + create('com.netflix.nebula.clojure') { id = 'com.netflix.nebula.clojure' displayName = 'Nebula Clojure' description = project.description diff --git a/settings.gradle b/settings.gradle index 0d48a16..335acca 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,13 +1,12 @@ -plugins { - id 'com.gradle.develocity' version '3.19' -} - -develocity { - buildScan { - termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use" - termsOfUseAgree = 'yes' +pluginManagement { + plugins { + id 'com.netflix.nebula.oss.settings' version '26.+' + id 'com.netflix.nebula.plugin-plugin' version '26.+' } } +plugins { + id 'com.netflix.nebula.oss.settings' +} rootProject.name = 'nebula-clojure-plugin' diff --git a/src/test/groovy/nebula/plugin/clojure/IsolatedProjectsSpec.groovy b/src/test/groovy/nebula/plugin/clojure/IsolatedProjectsSpec.groovy index 07e0e18..8159537 100644 --- a/src/test/groovy/nebula/plugin/clojure/IsolatedProjectsSpec.groovy +++ b/src/test/groovy/nebula/plugin/clojure/IsolatedProjectsSpec.groovy @@ -255,10 +255,10 @@ class IsolatedProjectsSpec extends BaseIntegrationTestKitSpec { } @Unroll - def 'legacy ID with deps and Maven publishing on Gradle #version, isolation=#isolated'() { + def 'plugin with deps and Maven publishing on Gradle #version, isolation=#isolated'() { given: fixture('single') - buildFile.text = buildFile.text.replace("id 'com.netflix.nebula.clojure'", "id 'nebula.clojure'; id 'maven-publish'") + buildFile.text = buildFile.text.replace("id 'com.netflix.nebula.clojure'", "id 'com.netflix.nebula.clojure'; id 'maven-publish'") buildFile << ''' description = 'Assessment documentation' publishing {