Merge pull request #2118 from ykhandelwal913/main

Reordering the task to avoid the snapshotCheck failure
intuit · Dec 10, 2021 · 11021fa · 11021fa
2 parents 56d7568 + 7d8e00c
commit 11021fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/plugins/gradle/__tests__/gradle.test.ts b/plugins/gradle/__tests__/gradle.test.ts
@@ -65,9 +65,9 @@ describe("Gradle Plugin", () => {
         "initScmAdapter",
         "checkCommitNeeded",
         "checkUpdateNeeded",
+        "updateVersion",
         "checkSnapshotDependencies",
         "runBuildTasks",
-        "updateVersion",
         "-Prelease.useAutomaticVersion=true",
         `-Prelease.newVersion=1.0.1`,
       ]);
@@ -88,9 +88,9 @@ describe("Gradle Plugin", () => {
         "initScmAdapter",
         "checkCommitNeeded",
         "checkUpdateNeeded",
+        "updateVersion",
         "checkSnapshotDependencies",
         "runBuildTasks",
-        "updateVersion",
         "-Prelease.useAutomaticVersion=true",
         `-Prelease.newVersion=2.0.0`,
       ]);
@@ -112,9 +112,9 @@ describe("Gradle Plugin", () => {
         "initScmAdapter",
         "checkCommitNeeded",
         "checkUpdateNeeded",
+        "updateVersion",
         "checkSnapshotDependencies",
         "runBuildTasks",
-        "updateVersion",
         "-Prelease.useAutomaticVersion=true",
         `-Prelease.newVersion=2.0.0`,
       ]);
@@ -135,9 +135,9 @@ describe("Gradle Plugin", () => {
         "initScmAdapter",
         "checkCommitNeeded",
         "checkUpdateNeeded",
+        "updateVersion",
         "checkSnapshotDependencies",
         "runBuildTasks",
-        "updateVersion",
         "-Prelease.useAutomaticVersion=true",
         `-Prelease.newVersion=1.2.0`,
       ]);
@@ -158,9 +158,9 @@ describe("Gradle Plugin", () => {
         "initScmAdapter",
         "checkCommitNeeded",
         "checkUpdateNeeded",
+        "updateVersion",
         "checkSnapshotDependencies",
         "runBuildTasks",
-        "updateVersion",
         "-Prelease.useAutomaticVersion=true",
         `-Prelease.newVersion=1.0.0`
       ]);
@@ -351,9 +351,9 @@ describe("Gradle Plugin", () => {
         "initScmAdapter",
         "checkCommitNeeded",
         "checkUpdateNeeded",
+        "updateVersion",
         "checkSnapshotDependencies",
         "runBuildTasks",
-        "updateVersion",
         "-Prelease.useAutomaticVersion=true",
         `-Prelease.newVersion=1.0.0`,
       ]);
@@ -389,9 +389,9 @@ describe("Gradle Plugin - Custom Command", () => {
         "initScmAdapter",
         "checkCommitNeeded",
         "checkUpdateNeeded",
+        "updateVersion",
         "checkSnapshotDependencies",
         "runBuildTasks",
-        "updateVersion",
         "-Prelease.useAutomaticVersion=true",
         `-Prelease.newVersion=1.0.1`,
         "-P prop=val",

diff --git a/plugins/gradle/src/index.ts b/plugins/gradle/src/index.ts
@@ -116,9 +116,9 @@ export default class GradleReleasePluginPlugin implements IPlugin {
         "initScmAdapter",
         "checkCommitNeeded",
         "checkUpdateNeeded",
+        "updateVersion",
         "checkSnapshotDependencies",
         "runBuildTasks",
-        "updateVersion",
         "-Prelease.useAutomaticVersion=true",
         `-Prelease.newVersion=${version}`,
         ...this.options.gradleOptions,