upgrade Groovy and Kotlin (#37)

Updates Groovy and Kotlin to current versions, and updates the CI workflow and documentation to include Ghidra 10.3.3.
goatshriek · Sep 15, 2023 · 918fb90 · 918fb90
1 parent c6ccdb2
commit 918fb90
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
  - Automatic class import now defaults to off instead of on.
  - All interactive interpreters are now lazily created.
+ - Upgrade to Groovy 4.0.14
+ - Upgrade to Kotlin 1.9.10
 
 
 ## [3.0.0] - 2023-07-13

diff --git a/build.gradle b/build.gradle
@@ -22,9 +22,9 @@ dependencies {
 	implementation('org.jruby:jruby-complete:9.4.3.0')
 	implementation('org.clojure:clojure:1.11.1')
 	implementation('org.apache.groovy:groovy:4.0.13')
-	implementation('org.apache.groovy:groovy-groovysh:4.0.13')
+	implementation('org.apache.groovy:groovy-groovysh:4.0.14')
 	testImplementation('junit:junit:4.13.2')
-	runtimeOnly('org.jetbrains.kotlin:kotlin-scripting-jsr223:1.9.0')
+	runtimeOnly('org.jetbrains.kotlin:kotlin-scripting-jsr223:1.9.10')
 }
 
 test {

diff --git a/src/main/java/rubydragon/groovy/GroovyGhidraInterpreter.java b/src/main/java/rubydragon/groovy/GroovyGhidraInterpreter.java
@@ -53,7 +53,7 @@
 import rubydragon.ScriptableGhidraInterpreter;
 
 /**
- * A Groovy intepreter for Ghidra.
+ * A Groovy interpreter for Ghidra.
  */
 public class GroovyGhidraInterpreter extends ScriptableGhidraInterpreter {
 

diff --git a/src/main/java/rubydragon/jshell/JShellGhidraInterpreter.java b/src/main/java/rubydragon/jshell/JShellGhidraInterpreter.java
@@ -47,7 +47,7 @@
 import rubydragon.GhidraInterpreter;
 
 /**
- * A Java intepreter for Ghidra, based on JShell.
+ * A Java interpreter for Ghidra, based on JShell.
  */
 public class JShellGhidraInterpreter extends GhidraInterpreter {
 	// simple structure to store both the type and value in a single map entry

diff --git a/src/main/java/rubydragon/kotlin/KotlinGhidraInterpreter.java b/src/main/java/rubydragon/kotlin/KotlinGhidraInterpreter.java
@@ -47,7 +47,7 @@
 import rubydragon.ScriptableGhidraInterpreter;
 
 /**
- * A Kotlin intepreter for Ghidra.
+ * A Kotlin interpreter for Ghidra.
  */
 public class KotlinGhidraInterpreter extends ScriptableGhidraInterpreter {
 	private Map<String, Object> setVariables = new HashMap<String, Object>();