Divide spring-project-init.gradle into separate scripts

* The `spring-artifactory-init.gradle` deals now only with `artifactoryPublish`
* The `next-dev-version-init.gradle` provides only `nextDevelopmentVersion` Gradle task

Author: artembilan

.github/workflows/spring-artifactory-gradle-release-staging.yml

@@ -69,7 +69,7 @@ jobs:
         run: |
           jf gradlec --repo-deploy libs-staging-local
           
-          cp build/utils/spring-project-init.gradle $HOME/.gradle/init.d
+          cp build/utils/*.gradle $HOME/.gradle/init.d
           
           buildName=${{ github.event.repository.name }}-${{ inputs.releaseVersion }}
           buildNumber=${{ github.run_number }}

.github/workflows/spring-artifactory-gradle-snapshot.yml

@@ -55,6 +55,6 @@ jobs:
 
       - name: Build and Publish
         run: |
-          jf gradle clean build ${{ inputs.gradleTasks }} artifactoryPublish --init-script build/utils/spring-project-init.gradle
+          jf gradle clean build ${{ inputs.gradleTasks }} artifactoryPublish --init-script build/utils/spring-artifactory-init.gradle.gradle
           jf rt build-publish
 

README.md

@@ -134,8 +134,8 @@ https://github.com/artembilan/spring-github-workflows/blob/710bf1214450ffb9a4d3a
 ## Gradle and Artifactory
 
 Gradle projects must not manage `com.jfrog.artifactory` plugin anymore: the `jf gradlec` command sets up this plugin and respective tasks into a project using JFrog specific Gradle init script.
-In addition, the [spring-artifactory-gradle-snapshot.yml](.github/workflows/spring-artifactory-gradle-snapshot.yml) and [spring-artifactory-gradle-release-staging.yml](.github/workflows/spring-artifactory-gradle-release-staging.yml) add `spring-project-init.gradle` script to provide an `artifactory` plugin settings for artifacts publications.
+In addition, the [spring-artifactory-gradle-snapshot.yml](.github/workflows/spring-artifactory-gradle-snapshot.yml) and [spring-artifactory-gradle-release-staging.yml](.github/workflows/spring-artifactory-gradle-release-staging.yml) add `spring-artifactory-init.gradle` script to provide an `artifactory` plugin settings for artifacts publications.
 
-The `spring-project-init.gradle` script also adds a `nextDevelopmentVersion` task which is used when release has been staged and job is ready to push `Next development version` commit.
+The `next-dev-version-init.gradle` script also adds a `nextDevelopmentVersion` task which is used when release has been staged and job is ready to push `Next development version` commit.
 
 See more information in the [Reusing Workflows](https://docs.github.com/en/actions/using-workflows/reusing-workflows). 

utils/next-dev-version-init.gradle

@@ -0,0 +1,25 @@
+gradle.projectsLoaded {
+    rootProject {
+        // No need to have this task in project: only when we perform GHA
+        tasks.register('nextDevelopmentVersion') {
+            doLast {
+                if (!project.version.endsWith('-SNAPSHOT')) {
+                    String nextDevelopmentVersion
+                    if (project.version.contains('-M') || project.version.contains('-RC')) {
+                        nextDevelopmentVersion = project.version - ~/(M|RC)\d+/ + 'SNAPSHOT'
+                    } else {
+                        def versionParts = project.version.tokenize('.')
+                        def major = versionParts[0]
+                        def minor = versionParts[1]
+                        def patch = versionParts[2] as int
+                        nextDevelopmentVersion = major + '.' + minor + '.' + (++patch) + '-SNAPSHOT'
+                    }
+
+                    def gradleProperties = file('gradle.properties')
+                    def newProps = gradleProperties.text.replace(project.version, nextDevelopmentVersion)
+                    gradleProperties.text = newProps
+                }
+            }
+        }
+    }
+}

utils/spring-project-init.gradle renamed to utils/spring-artifactory-init.gradle

@@ -2,6 +2,7 @@ gradle.projectsLoaded {
     rootProject {
         allprojects {
             afterEvaluate {
+                // The artifactoryPublish task is added by the Gradle init script from JFrog CLI
                 if (tasks.findByName('artifactoryPublish')) {
                     tasks.named('artifactoryPublish') {
                         enabled(false)
@@ -33,27 +34,5 @@ gradle.projectsLoaded {
                 }
             }
         }
-
-        // No need to have this task in project: only when we perform GHA
-        tasks.register('nextDevelopmentVersion') {
-            doLast {
-                if (!project.version.endsWith('-SNAPSHOT')) {
-                    String nextDevelopmentVersion
-                    if (project.version.contains('-M') || project.version.contains('-RC')) {
-                        nextDevelopmentVersion = project.version - ~/(M|RC)\d+/ + 'SNAPSHOT'
-                    } else {
-                        def versionParts = project.version.tokenize('.')
-                        def major = versionParts[0]
-                        def minor = versionParts[1]
-                        def patch = versionParts[2] as int
-                        nextDevelopmentVersion = major + '.' + minor + '.' + (++patch) + '-SNAPSHOT'
-                    }
-
-                    def gradleProperties = file('gradle.properties')
-                    def newProps = gradleProperties.text.replace(project.version, nextDevelopmentVersion)
-                    gradleProperties.text = newProps
-                }
-            }
-        }
     }
 }