Update project to Gradle 6.9

Jenkinsfile

@@ -26,7 +26,7 @@
                   string(credentialsId: 'atlas_node_release_coveralls_token', variable: 'coveralls_token')]) {
 
      def testEnvironment = [
-                                'osx' : [
+                                'macos' : [
                                             "artifactoryCredentials=${artifactory_publish}",
                                             "artifactory_npm_token=${npm_token}",
                                             "ATLAS_GITHUB_INTEGRATION_USER=${githubUser}",
@@ -46,5 +46,5 @@
                                 ]
                             ]
 
-     buildGradlePlugin plaforms: ['osx','windows'], coverallsToken: coveralls_token, testEnvironment: testEnvironment
+     buildGradlePlugin platforms: ['macos','windows'], coverallsToken: coveralls_token, testEnvironment: testEnvironment
  }

README.md

@@ -20,14 +20,13 @@ Applying the plugin
 **build.gradle**
 ```groovy
 plugins {
-    id 'net.wooga.node-release' version '0.+'
+    id 'net.wooga.node-release' version '2.+'
 }
 ```
 
 Conventions
 ===========
-* Applies [nebula.release](https://github.com/nebula-plugins/nebula-release-plugin)
-* Applies [com.moowork.node](https://github.com/nebula-plugins/nebula-release-plugin)
+* Applies [com.github.node-gradle](https://github.com/node-gradle/gradle-node-plugin)
 * Expects a valid `package.json` on project root.
 * Expects `clean`, `test` and `build` task in `scripts` block of `package.json`
 * Expects existence of a git repository with remote origin

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Wooga GmbH
+ * Copyright 2020-2022 Wooga GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,45 +16,54 @@
  */
 
 plugins {
-    id 'net.wooga.plugins' version '1.4.0'
+    id 'net.wooga.plugins' version '3.0.0-rc.2'
 }
 
 group 'net.wooga.gradle'
 description = 'Node release plugin for Gradle.'
 
 repositories {
-    jcenter()
     mavenCentral()
     maven {
         url "https://plugins.gradle.org/m2/"
     }
 }
 
 dependencies {
-    testCompile('org.jfrog.artifactory.client:artifactory-java-client-services:2.+') {
+    // TODO: Figure out how to address this once the below rejected versions finally work, they don't work when resolved to
+    testImplementation('org.jfrog.artifactory.client:artifactory-java-client-services:(2.9, 3]') {
         exclude module: 'logback-classic'
+        version {
+            reject("2.11.1", "2.11.0")
+            prefer("2.10.0")
+        }
     }
-    testCompile 'org.kohsuke:github-api:latest.release'
-    testCompile 'com.github.stefanbirkner:system-rules:1.18.0'
+    testImplementation 'org.kohsuke:github-api:1.3+'
+    testImplementation 'com.wooga.gradle:gradle-commons-test:0.3.0'
+
+    implementation 'org.ajoberstar.grgit:grgit-core:(4.1,5]'
+    implementation 'org.ajoberstar.grgit:grgit-gradle:(4.1,5]'
+    implementation "com.github.node-gradle:gradle-node-plugin:3.2.1"
 
-    compile 'com.netflix.nebula:nebula-release-plugin:6.+'
-    compile 'com.moowork.gradle:gradle-node-plugin:1.2.0'
-    compile "gradle.plugin.net.wooga.gradle:atlas-github:1.+"
-    compile "gradle.plugin.net.wooga.gradle:atlas-release:1.+"
-    compile gradleApi()
-    compile localGroovy()
+    // Internal wooga plugins
+    implementation 'com.wooga.gradle:gradle-commons:(0.4,0.5]'
+    implementation 'gradle.plugin.net.wooga.gradle:atlas-version:1+'
+    implementation 'gradle.plugin.net.wooga.gradle:atlas-github:(2, 3]'
 }
 
 pluginBundle {
     website = 'https://wooga.github.io/atlas-node-release'
     vcsUrl = 'https://github.com/wooga/atlas-node-release'
     tags = ['Wooga', 'release', 'node', 'npm']
+}
 
+gradlePlugin {
     plugins {
         nodeRelease {
             id = 'net.wooga.node-release'
             displayName = 'Gradle Wooga Node Release plugin'
             description = 'Plugin for wooga npm library releases'
+            implementationClass = "wooga.gradle.node.NodeReleasePlugin"
         }
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip

src/integrationTest/groovy/wooga/gradle/node/GithubIntegrationSpec.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Wooga GmbH
+ * Copyright 2020 Wooga GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/integrationTest/groovy/wooga/gradle/node/IntegrationSpec.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Wooga GmbH
+ * Copyright 2020 Wooga GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,18 +22,7 @@ import groovy.json.StringEscapeUtils
 import org.junit.Rule
 import org.junit.contrib.java.lang.system.ProvideSystemProperty
 
-class IntegrationSpec extends nebula.test.IntegrationSpec {
-
-    @Rule
-    ProvideSystemProperty properties = new ProvideSystemProperty("ignoreDeprecations", "true")
-
-    def escapedPath(String path) {
-        String osName = System.getProperty("os.name").toLowerCase()
-        if (osName.contains("windows")) {
-            return StringEscapeUtils.escapeJava(path)
-        }
-        path
-    }
+class IntegrationSpec extends com.wooga.gradle.test.IntegrationSpec {
 
     String packageJsonContent(Map<String, Object> content) {
         new JsonBuilder(content).toPrettyString()

src/integrationTest/groovy/wooga/gradle/node/NodeReleasePluginCredentialsSpec.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Wooga GmbH
+ * Copyright 2018-2022 Wooga GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/integrationTest/groovy/wooga/gradle/node/NodeReleasePluginEngineSpec.groovy

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2020 Wooga GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package wooga.gradle.node
 
 import org.ajoberstar.grgit.Grgit

src/integrationTest/groovy/wooga/gradle/node/NodeReleasePluginPublishSpec.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Wooga GmbH
+ * Copyright 2020-2022 Wooga GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,14 +127,16 @@ class NodeReleasePluginPublishSpec extends GithubIntegrationSpec {
     def cleanupArtifactory(String repoName, String artifactName) {
         List<RepoPath> searchItems = artifactory.searches()
                 .repositories(repoName)
-                .artifactsByName(artifactName)
+                .artifactsByName(artifactName.replaceAll(/\+.*$/, ''))
                 .doSearch()
 
         for (RepoPath searchItem : searchItems) {
-            String repoKey = searchItem.getRepoKey()
-            println(repoKey)
             String itemPath = searchItem.getItemPath()
-            artifactory.repository(repoName).delete(itemPath)
+            try {
+                artifactory.repository(repoName).delete(itemPath)
+            } catch (e) {
+                println("error while deleting ${itemPath}: ${e}")
+            }
         }
     }
 
@@ -144,8 +146,7 @@ class NodeReleasePluginPublishSpec extends GithubIntegrationSpec {
                 .artifactsByName(artifactName)
                 .doSearch()
 
-        assert packages.size() >= 2
-        true
+        packages.size() >= 2
     }
 
     def packageNameForPackageJson() {
@@ -154,7 +155,7 @@ class NodeReleasePluginPublishSpec extends GithubIntegrationSpec {
     }
 
     @Unroll
-    def 'builds and publish a package running task #task with version #version'() {
+    def 'builds and publish a package running task publish with #stage with version #version'() {
         given: "the future npm artifact"
         packageJsonFile.exists()
 
@@ -167,7 +168,8 @@ class NodeReleasePluginPublishSpec extends GithubIntegrationSpec {
         git.commit(message: 'add files')
 
         when: "run the publish task"
-        def result = runTasks(task)
+        environmentVariables.set("VERSION_BUILDER_STAGE", stage)
+        def result = runTasks("publish")
         def config = new JsonSlurper().parseText(packageJsonFile.text)
 
         then:
@@ -178,14 +180,14 @@ class NodeReleasePluginPublishSpec extends GithubIntegrationSpec {
         config.version == version
 
         where:
-        task        | version
-        "snapshot"  | "0.1.0-master.1"
-        "candidate" | "0.1.0-rc.1"
-        "final"     | "0.1.0"
+        stage      | version
+        "snapshot" | "0.1.0-master.1"
+        "rc"       | "0.1.0-rc.1"
+        "final"    | "0.1.0"
     }
 
     @Unroll
-    def 'builds and and create #task #version with github release #expectRelease as prerelease #prerelease'() {
+    def 'build and creates #stage version #version with github release #expectRelease as prerelease #prerelease'() {
         given: "the future npm artifact"
         packageJsonFile.exists()
 
@@ -197,25 +199,32 @@ class NodeReleasePluginPublishSpec extends GithubIntegrationSpec {
         git.add(patterns: ['.'])
         git.commit(message: 'add files')
 
+        and: "ensure artifact is not located on artifactory"
+        environmentVariables.set("VERSION_BUILDER_STAGE", stage)
+        cleanupArtifactory(artifactoryRepoName, "${packageID}-${version}")
+        assert !hasPackageOnArtifactory(artifactoryRepoName, "${packageID}-${version}")
+
         when: "run the publish task"
-        def result = runTasks(task)
+        def result = runTasks("publish")
 
         then:
         result.success
         result.wasExecuted("node_publish")
         result.wasExecuted("npm_publish")
         result.wasSkipped("githubPublish") != expectRelease
 
+        sleep(2000)
         hasReleaseByName(version) == expectRelease
+        hasPackageOnArtifactory(artifactoryRepoName, "${packageID}-${version}")
 
         if (expectRelease) {
             getReleaseByName(version).prerelease == prerelease
         }
 
         where:
-        task        | version          | expectRelease | prerelease
-        "snapshot"  | "0.1.0-master.1" | false         | true
-        "candidate" | "0.1.0-rc.1"     | true          | true
-        "final"     | "0.1.0"          | true          | false
+        stage      | version          | expectRelease | prerelease
+        "snapshot" | "0.1.0-master.1" | false         | true
+        "rc"       | "0.1.0-rc.1"     | true          | true
+        "final"    | "0.1.0"          | true          | false
     }
 }

src/integrationTest/groovy/wooga/gradle/node/tasks/ModifyPackageJsonTaskSpec.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Wooga GmbH
+ * Copyright 2020-2022 Wooga GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@ import groovy.json.JsonSlurper
 import spock.lang.Unroll
 import wooga.gradle.node.IntegrationSpec
 
+import static com.wooga.gradle.PlatformUtils.escapedPath
+
 class ModifyPackageJsonTaskSpec extends IntegrationSpec {
 
     def "run ModifyPackageJsonTask successfully"() {

src/main/groovy/wooga/gradle/node/Engine.groovy

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Wooga GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package wooga.gradle.node
+
+enum Engine {
+    npm,
+    yarn
+}