Resolve merge conflicts and maintain releasePlugin task naming

- Keep releasePlugin and releasePluginToRegistry task names
- Remove duplicate registry configuration tests from merge
- Update README to use releasePlugin consistently in examples
- All tests passing with resolved conflicts

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: pditommaso

README.md

@@ -79,13 +79,13 @@ Using environment variables:
 ```bash
 export NPR_API_URL=https://my-custom-registry.com/api
 export NPR_API_KEY=your-secret-api-key
-./gradlew publishPlugin
+./gradlew releasePlugin
 ```
 
 This will add some useful tasks to your Gradle build:
-* `assemble` - compile the Nextflow plugin code and assemble it into a zip file
-* `installPlugin` - copy the assembled plugin into your local Nextflow plugins dir
-* `publishPlugin` - publish the assembled plugin to the plugin registry
+* `assemble` - Compile the Nextflow plugin code and assemble it into a zip file
+* `installPlugin` - Copy the assembled plugin into your local Nextflow plugins dir
+* `releasePlugin` - Release the assembled plugin to the plugin registry
 
 You should also ensure that your project's `settings.gradle` declares the plugin name, eg:
 ```gradle
@@ -129,5 +129,5 @@ Then use this command:
 
 
 ```
-./gradlew publishPlugins
+./gradlew releasePlugins
 ```

src/main/groovy/io/nextflow/gradle/NextflowPlugin.groovy

@@ -129,22 +129,22 @@ class NextflowPlugin implements Plugin<Project> {
 
                 // add registry publish task, if configured
                 if (config.publishing.registry) {
-                    // publishPluginToRegistry - publishes plugin to a plugin registry
-                    project.tasks.register('publishPluginToRegistry', RegistryUploadTask)
-                    project.tasks.publishPluginToRegistry.dependsOn << project.tasks.packagePlugin
-                    publishTasks << project.tasks.publishPluginToRegistry
+                    // releasePluginToRegistry - publishes plugin to a plugin registry
+                    project.tasks.register('releasePluginToRegistry', RegistryUploadTask)
+                    project.tasks.releasePluginToRegistry.dependsOn << project.tasks.packagePlugin
+                    publishTasks << project.tasks.releasePluginToRegistry
                 }
 
 
-                // finally, configure the destination-agnostic 'publish' task
+                // finally, configure the destination-agnostic 'release' task
                 if (!publishTasks.isEmpty()) {
-                    // publishPlugin - all the release/publishing actions
-                    project.tasks.register('publishPlugin', {
+                    // releasePlugin - all the release/publishing actions
+                    project.tasks.register('releasePlugin', {
                         group = 'Nextflow Plugin'
-                        description = 'publish plugin to configured destinations'
+                        description = 'Release plugin to configured destination'
                     })
                     for (task in publishTasks) {
-                        project.tasks.publishPlugin.dependsOn << task
+                        project.tasks.releasePlugin.dependsOn << task
                     }
                 }
             }

src/test/groovy/io/nextflow/gradle/NextflowPluginTest.groovy

@@ -1,6 +1,5 @@
 package io.nextflow.gradle
 
-import io.nextflow.gradle.registry.RegistryPublishConfig
 import org.gradle.api.Project
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.Specification
@@ -20,7 +19,7 @@ class NextflowPluginTest extends Specification {
         project.pluginManager.apply('io.nextflow.nextflow-plugin')
     }
 
-    def "should register publishPlugin task when publishing is configured"() {
+    def "should register releasePlugin task when publishing is configured"() {
         given:
         project.nextflowPlugin {
             description = 'A test plugin'
@@ -39,13 +38,13 @@ class NextflowPluginTest extends Specification {
         project.evaluate()
 
         then:
-        project.tasks.findByName('publishPlugin') != null
-        project.tasks.publishPlugin.group == 'Nextflow Plugin'
-        project.tasks.publishPlugin.description == 'publish plugin to configured destinations'
+        project.tasks.findByName('releasePlugin') != null
+        project.tasks.releasePlugin.group == 'Nextflow Plugin'
+        project.tasks.releasePlugin.description == 'Release plugin to configured destination'
     }
 
 
-    def "should make publishPlugin depend on registry publishing task"() {
+    def "should make releasePlugin depend on registry publishing task"() {
         given:
         project.nextflowPlugin {
             description = 'A test plugin'
@@ -64,13 +63,13 @@ class NextflowPluginTest extends Specification {
         project.evaluate()
 
         then:
-        def publishPlugin = project.tasks.publishPlugin
-        def publishToRegistry = project.tasks.publishPluginToRegistry
-        publishPlugin.taskDependencies.getDependencies(publishPlugin).contains(publishToRegistry)
+        def releasePlugin = project.tasks.releasePlugin
+        def releaseToRegistry = project.tasks.releasePluginToRegistry
+        releasePlugin.taskDependencies.getDependencies(releasePlugin).contains(releaseToRegistry)
     }
 
 
-    def "should not register publishPlugin task when no publishing is configured"() {
+    def "should not register releasePlugin task when no publishing is configured"() {
         given:
         project.nextflowPlugin {
             description = 'A test plugin'
@@ -84,137 +83,7 @@ class NextflowPluginTest extends Specification {
         project.evaluate()
 
         then:
-        project.tasks.findByName('publishPlugin') == null
+        project.tasks.findByName('releasePlugin') == null
     }
 
-    def "should resolve registry URL from explicit configuration"() {
-        given:
-        def config = new RegistryPublishConfig(project)
-        config.url = 'https://custom-registry.com/api'
-
-        when:
-        def resolvedUrl = config.getResolvedUrl()
-
-        then:
-        resolvedUrl == 'https://custom-registry.com/api'
-    }
-
-    def "should resolve registry URL from gradle property"() {
-        given:
-        project.ext.set('npr.apiUrl', 'https://gradle-prop-registry.com/api')
-        def config = new RegistryPublishConfig(project)
-
-        when:
-        def resolvedUrl = config.getResolvedUrl()
-
-        then:
-        resolvedUrl == 'https://gradle-prop-registry.com/api'
-    }
-
-    def "should resolve registry URL from environment variable"() {
-        given:
-        def config = new RegistryPublishConfig(project) {
-            @Override
-            String getResolvedUrl() {
-                // If explicitly set, use it
-                if (url) {
-                    return url
-                }
-                
-                // Try gradle property
-                def gradleProp = project.findProperty('npr.apiUrl')
-                if (gradleProp) {
-                    return gradleProp.toString()
-                }
-                
-                // Mock environment variable for test (NPR_API_URL)
-                return 'https://env-registry.com/api'
-            }
-        }
-
-        when:
-        def resolvedUrl = config.getResolvedUrl()
-
-        then:
-        resolvedUrl == 'https://env-registry.com/api'
-    }
-
-    def "should use default registry URL when none provided"() {
-        given:
-        def config = new RegistryPublishConfig(project)
-
-        when:
-        def resolvedUrl = config.getResolvedUrl()
-
-        then:
-        resolvedUrl == 'https://plugin-registry.seqera.io/api'
-    }
-
-    def "should resolve API key from explicit configuration"() {
-        given:
-        def config = new RegistryPublishConfig(project)
-        config.apiKey = 'explicit-api-key'
-
-        when:
-        def resolvedApiKey = config.getResolvedApiKey()
-
-        then:
-        resolvedApiKey == 'explicit-api-key'
-    }
-
-    def "should resolve API key from gradle property"() {
-        given:
-        project.ext.set('npr.apiKey', 'gradle-prop-api-key')
-        def config = new RegistryPublishConfig(project)
-
-        when:
-        def resolvedApiKey = config.getResolvedApiKey()
-
-        then:
-        resolvedApiKey == 'gradle-prop-api-key'
-    }
-
-    def "should resolve API key from environment variable"() {
-        given:
-        def config = new RegistryPublishConfig(project) {
-            @Override
-            String getResolvedApiKey() {
-                // If explicitly set, use it
-                if (apiKey) {
-                    return apiKey
-                }
-                
-                // Try gradle property
-                def gradleProp = project.findProperty('npr.apiKey')
-                if (gradleProp) {
-                    return gradleProp.toString()
-                }
-                
-                // Mock environment variable for test
-                return 'env-api-key'
-            }
-        }
-
-        when:
-        def resolvedApiKey = config.getResolvedApiKey()
-
-        then:
-        resolvedApiKey == 'env-api-key'
-    }
-
-    def "should throw error when no API key provided"() {
-        given:
-        def config = new RegistryPublishConfig(project)
-
-        when:
-        config.getResolvedApiKey()
-
-        then:
-        def ex = thrown(RuntimeException)
-        ex.message.contains('Registry API key not provided')
-        ex.message.contains('nextflowPlugin.publishing.registry.apiKey')
-        ex.message.contains('npr.apiKey')
-        ex.message.contains('NPR_API_KEY')
-    }
-
-}
+}