Merge branch 'develop' into Fix-recursion-script-MUTE10_xx

smeup · Oct 4, 2024 · 003fec0 · 003fec0
2 parents 9fae1b6 + 922fdfa
commit 003fec0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/dspfparser/build.gradle b/dspfparser/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-cbor:$serializationVersion"

diff --git a/examples/build.gradle b/examples/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     implementation project(":rpgJavaInterpreter-core")
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
 }
 
 task javadocJar(type: Jar) {

diff --git a/gradle.properties b/gradle.properties
@@ -20,6 +20,8 @@ FlightRecorderOptions=stackdepth=64
 kotlinVersion=2.0.20
 serializationVersion=1.7.3
 jvmVersion=11
+junitVersion=5.11.1
+antlrVersion=4.13.2
 reloadVersion=develop-SNAPSHOT
 jarikoGroupId=io.github.smeup.jariko
 jarikoVersion=develop-SNAPSHOT
diff --git a/kolasu/build.gradle b/kolasu/build.gradle
@@ -3,7 +3,8 @@
 //-----------------
 buildscript {
 
-    ext.antlr_version = '4.7.2'
+    ext.antlrVersion = "${antlrVersion}"
+    ext.junitVersion = "${junitVersion}"
 
     repositories {
         mavenCentral()
@@ -33,16 +34,16 @@ repositories {
 }
 
 dependencies {
-    implementation "org.antlr:antlr4:$antlr_version"
-    implementation "org.antlr:antlr4-runtime:$antlr_version"
+    implementation "org.antlr:antlr4:$antlrVersion"
+    implementation "org.antlr:antlr4-runtime:$antlrVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
 
-    implementation 'com.fifesoft:rsyntaxtextarea:2.5.8'
-    implementation 'com.fifesoft:autocomplete:2.5.8'
+    implementation 'com.fifesoft:rsyntaxtextarea:3.5.1'
+    implementation 'com.fifesoft:autocomplete:3.3.1'
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-cbor:$serializationVersion"
 

diff --git a/rpgJavaInterpreter-core/build.gradle b/rpgJavaInterpreter-core/build.gradle
@@ -22,7 +22,8 @@ import java.text.SimpleDateFormat
 buildscript {
     ext.kotlinVersion = "${kotlinVersion}"
     ext.jvmVersion = "${jvmVersion}"
-    ext.antlr_version = '4.13.2'
+    ext.antlrVersion = "${antlrVersion}"
+    ext.junitVersion = "${junitVersion}"
 
     repositories {
         mavenCentral()
@@ -41,15 +42,16 @@ buildscript {
 
 apply plugin: 'antlr'
 
-def antlrVersion = ext.antlr_version
+def antlrVersion = ext.antlrVersion
+def junitVersion = ext.junitVersion
 def generatedMain = "generated-src/antlr/main"
 def generatedMainFile = file(generatedMain)
 
 def unlimitedStringTypeFlag = "jariko.features.UnlimitedStringTypeFlag"
 
 dependencies {
-    antlr "org.antlr:antlr4:$antlr_version"
-    implementation "org.antlr:antlr4-runtime:$antlr_version"
+    antlr "org.antlr:antlr4:$antlrVersion"
+    implementation "org.antlr:antlr4-runtime:$antlrVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
@@ -76,7 +78,7 @@ dependencies {
 
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.1'
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
     testImplementation 'org.hsqldb:hsqldb:2.7.3'
     testImplementation 'org.mockito.kotlin:mockito-kotlin:5.4.0'
 }