Merge pull request #2469 from atom-community/fix-kotlin

aminya · web-flow · commit 80bb364ac349 · 2021-05-10T22:19:56.000-05:00
fix: fix kotlin for newer Kotlin versions (#2468)
diff --git a/lib/grammars/java.js b/lib/grammars/java.js
@@ -33,7 +33,7 @@ export const Java = {
 
 function KotlinArgs(filepath, jar) {
   const jarNew = (jar !== null ? jar : path.basename(filepath)).replace(/\.kt$/, ".jar")
-  const cmd = `kotlinc '${filepath}' -include-runtime -d ${jarNew} && java -jar ${jarNew}`
+  const cmd = `kotlinc '${filepath}' -include-runtime -o ${jarNew} && java -jar ${jarNew}`
   return GrammarUtils.formatArgs(cmd)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export const Java = {`
`33`	`33`
`34`	`34`	`function KotlinArgs(filepath, jar) {`
`35`	`35`	`const jarNew = (jar !== null ? jar : path.basename(filepath)).replace(/\.kt$/, ".jar")`
`36`		- const cmd = `kotlinc '${filepath}' -include-runtime -d ${jarNew} && java -jar ${jarNew}`
	`36`	+ const cmd = `kotlinc '${filepath}' -include-runtime -o ${jarNew} && java -jar ${jarNew}`
`37`	`37`	`return GrammarUtils.formatArgs(cmd)`
`38`	`38`	`}`
`39`	`39`