Merge pull request #2067 from torkjel/patch-1

sbt: Avoid clobbering unrelated version settings
intuit · Jan 20, 2022 · 6159c24 · 6159c24
2 parents 59b42d6 + a208ce7
commit 6159c24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/plugins/sbt/__tests__/sbt.test.ts b/plugins/sbt/__tests__/sbt.test.ts
@@ -98,7 +98,7 @@ describe("sbt plugin", () => {
       expect(exec).toHaveBeenCalledTimes(2);
       expect(exec).lastCalledWith("sbt", [
         "--client",
-        'set every version := \\"0.1.0\\"',
+        'set ThisBuild / version := \\"0.1.0\\"',
       ]);
     });
   });
@@ -159,7 +159,7 @@ describe("sbt plugin", () => {
 
       expect(exec).not.toHaveBeenCalledWith("sbt", [
         "--client",
-        'set every version := \\"0.1.0\\"',
+        'set ThisBuild / version := \\"0.1.0\\"',
       ]);
 
       expect(result).toMatchObject({
@@ -187,7 +187,7 @@ describe("sbt plugin", () => {
 
       expect(exec).toHaveBeenCalledWith("sbt", [
         "--client",
-        `set every version := \\"${newVersion}\\"`,
+        `set ThisBuild / version := \\"${newVersion}\\"`,
       ]);
 
       expect(result).toMatchObject({ newVersion });

diff --git a/plugins/sbt/src/index.ts b/plugins/sbt/src/index.ts
@@ -38,7 +38,7 @@ export async function sbtGetVersion(): Promise<string> {
 
 /** Set version in sbt to the given value */
 export async function sbtSetVersion(version: string): Promise<string> {
-  return sbtClient(`set every version := \\"${version}\\"`);
+  return sbtClient(`set ThisBuild / version := \\"${version}\\"`);
 }
 
 /** Run sbt publish */