addressed PR comments

MitchellGale · MitchellGale · commit 07c263818b05 · 2023-08-21T12:50:17.000-07:00
Signed-off-by: Mitchell Gale &lt;Mitchell.Gale@improving.com&gt;
diff --git a/build.gradle b/build.gradle
@@ -116,8 +116,9 @@ allprojects {
         sourceCompatibility = targetCompatibility = "11"
     }
     configurations.all {
-        resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
-        resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"
+        resolutionStrategy.force "com.squareup.okio:okio:3.5.0"
+        resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.9.0"
+        resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0"
     }
 }
 
@@ -219,12 +220,5 @@ task updateVersion {
         println "Setting version to ${newVersion}."
         // String tokenization to support -SNAPSHOT
         ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true)
-        ant.replaceregexp(match:'"version": "\\d+.\\d+.\\d+.\\d+', replace:'"version": ' + '"' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true) {
-            fileset(dir: projectDir) {
-                include(name: "workbench/package.json")
-                include(name: "workbench/opensearch_dashboards.json")
-            }
-        }
-        ant.replaceregexp(file:'workbench/opensearch_dashboards.json', match:'"opensearchDashboardsVersion": "\\d+.\\d+.\\d+', replace:'"opensearchDashboardsVersion": ' + '"' + newVersion.tokenize('-')[0], flags:'g', byline:true)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,9 @@ allprojects {`
`116`	`116`	`sourceCompatibility = targetCompatibility = "11"`
`117`	`117`	`}`
`118`	`118`	`configurations.all {`
`119`		`- resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"`
`120`		`- resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"`
	`119`	`+ resolutionStrategy.force "com.squareup.okio:okio:3.5.0"`
	`120`	`+ resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.9.0"`
	`121`	`+ resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0"`
`121`	`122`	`}`
`122`	`123`	`}`
`123`	`124`
`@@ -219,12 +220,5 @@ task updateVersion {`
`219`	`220`	`println "Setting version to ${newVersion}."`
`220`	`221`	`// String tokenization to support -SNAPSHOT`
`221`	`222`	`ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true)`
`222`		`- ant.replaceregexp(match:'"version": "\\d+.\\d+.\\d+.\\d+', replace:'"version": ' + '"' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true) {`
`223`		`- fileset(dir: projectDir) {`
`224`		`- include(name: "workbench/package.json")`
`225`		`- include(name: "workbench/opensearch_dashboards.json")`
`226`		`- }`
`227`		`- }`
`228`		`- ant.replaceregexp(file:'workbench/opensearch_dashboards.json', match:'"opensearchDashboardsVersion": "\\d+.\\d+.\\d+', replace:'"opensearchDashboardsVersion": ' + '"' + newVersion.tokenize('-')[0], flags:'g', byline:true)`
`229`	`223`	`}`
`230`	`224`	`}`