From 844c97930f02c5d4a97f708259f36cb7d76344b3 Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Wed, 20 Nov 2024 22:11:39 +0100
Subject: [PATCH] fix Antlr grammar build and convert final build.gradle to
 build.gradle.kts (kotlin DSL)

---
 .idea/misc.xml                            |  4 ++--
 build.gradle => build.gradle.kts          |  4 ++--
 parser/antlr/Antlr4.LICENSE               | 13 -------------
 parser/antlr/Makefile                     |  3 ---
 parser/build.gradle.kts                   | 11 ++++-------
 parser/{ => src/main}/antlr/Prog8ANTLR.g4 |  0
 6 files changed, 8 insertions(+), 27 deletions(-)
 rename build.gradle => build.gradle.kts (56%)
 delete mode 100644 parser/antlr/Antlr4.LICENSE
 delete mode 100644 parser/antlr/Makefile
 rename parser/{ => src/main}/antlr/Prog8ANTLR.g4 (100%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index e24ec7891..b39a585dd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,13 +4,13 @@
     <option name="perGrammarGenerationSettings">
       <list>
         <PerGrammarGenerationSettings>
-          <option name="fileName" value="$PROJECT_DIR$/parser/antlr/Prog8ANTLR.g4" />
+          <option name="fileName" value="$PROJECT_DIR$/parser/src/main/antlr/Prog8ANTLR.g4" />
           <option name="autoGen" value="true" />
           <option name="outputDir" value="$PROJECT_DIR$/parser/src/prog8/parser" />
           <option name="libDir" value="" />
           <option name="encoding" value="" />
           <option name="pkg" value="" />
-          <option name="language" value="" />
+          <option name="language" value="Java" />
           <option name="generateListener" value="false" />
         </PerGrammarGenerationSettings>
       </list>
diff --git a/build.gradle b/build.gradle.kts
similarity index 56%
rename from build.gradle
rename to build.gradle.kts
index bb2e98f9c..4ea44fa3a 100644
--- a/build.gradle
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "$kotlinVersion" apply false
+    kotlin("jvm") version "2.0.21"
 }
 
 allprojects {
@@ -7,4 +7,4 @@ allprojects {
         mavenLocal()
         mavenCentral()
     }
-}
+}
\ No newline at end of file
diff --git a/parser/antlr/Antlr4.LICENSE b/parser/antlr/Antlr4.LICENSE
deleted file mode 100644
index 51e3cf387..000000000
--- a/parser/antlr/Antlr4.LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-ANTLR 4 License
-[The BSD License]
-Copyright (c) 2012 Terence Parr and Sam Harwell
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/parser/antlr/Makefile b/parser/antlr/Makefile
deleted file mode 100644
index f3896c05a..000000000
--- a/parser/antlr/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-
-parser:
-	antlr4 -o ../src/prog8/parser -no-listener -no-visitor -Dlanguage=Java Prog8ANTLR.g4
diff --git a/parser/build.gradle.kts b/parser/build.gradle.kts
index bb028a861..82ea36193 100644
--- a/parser/build.gradle.kts
+++ b/parser/build.gradle.kts
@@ -19,22 +19,19 @@ configurations.all {
     exclude(group = "com.ibm.icu", module = "icu4j")
 }
 
-tasks.compileJava {
-    dependsOn(tasks.withType<AntlrTask>())
-}
-
 tasks.generateGrammarSource {
     outputDirectory = file("src/prog8/parser")
     arguments.addAll(listOf("-no-listener", "-no-visitor"))
 }
 
+tasks.compileJava {
+    dependsOn(tasks.generateGrammarSource)
+}
+
 sourceSets {
     main {
         java {
             srcDir("${project.projectDir}/src")
         }
-        antlr {
-            srcDirs(listOf("${project.projectDir}/antlr"))
-        }
     }
 }
\ No newline at end of file
diff --git a/parser/antlr/Prog8ANTLR.g4 b/parser/src/main/antlr/Prog8ANTLR.g4
similarity index 100%
rename from parser/antlr/Prog8ANTLR.g4
rename to parser/src/main/antlr/Prog8ANTLR.g4