Applying mcm-update to xcfa-refactor (ftsrg#199)

* Added mcm-udpate and xcfa-refactor files

* Updated copyright headers

* Fixed compilation errors

* Fixed tests

* Added dependencies for antlr and kotlin

* Added dependencies for antlr and kotlin

* Fixed bugs from Sonar

buildSrc/build.gradle.kts

@@ -13,7 +13,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import java.io.FileOutputStream
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -90,6 +89,11 @@ fun generateVersionsSource(): String {
 }
 
 tasks {
+    withType<KotlinCompile>() {
+        kotlinOptions {
+            jvmTarget = "17"
+        }
+    }
     val generateVersions by creating {
         description = "Updates Versions.kt from project properties."
         group = "build"

buildSrc/src/main/kotlin/antlr-grammar.gradle.kts

@@ -13,7 +13,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import java.nio.file.Files
 
 apply<AntlrPlugin>()
 

buildSrc/src/main/kotlin/kotlin-common.gradle.kts

@@ -29,4 +29,21 @@ tasks {
             jvmTarget = "17"
         }
     }
+}
+
+// Check if "antlr-common" plugin is applied and if the "generateGrammarSource" task is available
+// If yes, add a task dependency from "compileKotlin" to "generateGrammarSource"
+project.plugins.withType<AntlrPlugin> {
+    val generateGrammarTask = tasks.findByName("generateGrammarSource")
+    if (generateGrammarTask != null) {
+        project.tasks.named("compileKotlin").configure {
+            dependsOn(generateGrammarTask)
+        }
+    }
+    val generateTestGrammarTask = tasks.findByName("generateTestGrammarSource")
+    if (generateTestGrammarTask != null) {
+        project.tasks.named("compileTestKotlin").configure {
+            dependsOn(generateTestGrammarTask)
+        }
+    }
 }

settings.gradle.kts

@@ -34,6 +34,7 @@ include(
 
     "xcfa/xcfa",
     "xcfa/cat",
+    "xcfa/exec-graph-cli",
     "xcfa/c2xcfa",
     "xcfa/litmus2xcfa",
     "xcfa/xcfa-analysis",
@@ -51,7 +52,8 @@ include(
     "solver/solver",
     "solver/solver-z3",
     "solver/solver-smtlib",
-    "solver/solver-smtlib-cli"
+    "solver/solver-smtlib-cli",
+    "solver/graph-solver",
 )
 
 for (project in rootProject.children) {

subprojects/common/analysis/build.gradle.kts

@@ -22,5 +22,6 @@ dependencies {
     implementation(project(":theta-common"))
     implementation(project(":theta-core"))
     implementation(project(":theta-solver"))
+    implementation(project(":theta-graph-solver"))
     testImplementation(project(":theta-solver-z3"))
 }