Lara-dsl-deprecation Checkpoint 5

.github/copilot-instructions.md

@@ -5,7 +5,7 @@
 This repository contains 24 Java libraries developed by the SPeCS research group, organized as independent Gradle projects. Each library extends or enhances existing Java libraries (indicated by the "-Plus" suffix) or provides custom utilities. The repository uses Java 17, Gradle for builds, and follows a multi-project structure without a root Gradle configuration.
 
 **Repository Statistics:**
-- 24 main Java libraries + 3 legacy projects (RuntimeMutators, SpecsHWUtils, SupportJavaLibs)
+- 24 main Java libraries + 1 legacy project (SpecsHWUtils)
 - ~200K+ lines of Java code across all projects
 - Mixed testing frameworks: JUnit 5 (modern projects) and JUnit 4 (legacy projects)
 - Inter-project dependencies centered around SpecsUtils as the core utility library
@@ -101,13 +101,10 @@ ProjectName/
 
 **Development Tools:**
 - **JavaGenerator** - Java code generation utilities
-- **EclipseUtils** - Eclipse IDE integration tools
 - **AntTasks** - Custom Ant build tasks
 
 ### Legacy Projects (No Gradle builds)
-- **RuntimeMutators** - Runtime code mutation (Eclipse project only)
 - **SpecsHWUtils** - Hardware utilities (Eclipse project only)  
-- **SupportJavaLibs** - Supporting libraries and tools
 
 ## Continuous Integration
 
@@ -125,7 +122,7 @@ File: `.github/workflows/nightly.yml`
 5. Generates dependency graphs
 
 ### Tested Projects (in CI order):
-AntTasks, AsmParser, CommonsCompressPlus, CommonsLangPlus, GearmanPlus, GitlabPlus, GitPlus, Gprofer, GsonPlus, GuiHelper, JacksonPlus, JadxPlus, JavaGenerator, jOptions, JsEngine, LogbackPlus, MvelPlus, SlackPlus, SpecsUtils, SymjaPlus, tdrcLibrary, XStreamPlus, Z3Helper
+AntTasks, AsmParser, CommonsCompressPlus, CommonsLangPlus, GearmanPlus, GitlabPlus, GitPlus, Gprofer, GsonPlus, GuiHelper, JacksonPlus, JadxPlus, JavaGenerator, jOptions, JsEngine, LogbackPlus, MvelPlus, SlackPlus, SpecsUtils, SymjaPlus, tdrcLibrary, XStreamPlus
 
 ### Local Validation Steps
 1. **Build specific project**: `cd ProjectName && gradle build`

.github/workflows/nightly.yml

@@ -41,7 +41,6 @@ jobs:
             AsmParser
             CommonsCompressPlus
             CommonsLangPlus
-            GearmanPlus
             GitlabPlus
             GitPlus
             Gprofer
@@ -59,13 +58,12 @@ jobs:
             SymjaPlus
             tdrcLibrary
             XStreamPlus
-            Z3Helper
           )
           failed=()
           for project in "${projects[@]}"; do
             echo "\n===== Building and testing $project ====="
             cd "$project"
-            if ! gradle build test; then
+            if ! gradle build; then
               echo "[ERROR] $project failed to build or test"
               failed+=("$project")
             fi

AntTasks/build.gradle

@@ -22,11 +22,11 @@ dependencies {
     implementation ':SpecsUtils'
 
     // Ivy dependencies
-    implementation group: 'org.apache.ant', name: 'ant', version: '1.9.1'
-    implementation group: 'org.apache.ivy', name: 'ivy', version: '2.5.0-rc1'
-    implementation group: 'org.apache.ant', name: 'ant-jsch', version: '1.10.5'
-    implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
-    implementation group: 'com.io7m.xom', name: 'xom', version: '1.2.10'
+    implementation 'org.apache.ant:ant:1.9.1'
+    implementation 'org.apache.ivy:ivy:2.5.0-rc1'
+    implementation 'org.apache.ant:ant-jsch:1.10.5'
+    implementation 'org.slf4j:slf4j-simple:1.7.25'
+    implementation 'com.io7m.xom:xom:1.2.10'
 }
 
 // Project sources

AntTasks/settings.gradle

@@ -1,4 +1,4 @@
 rootProject.name = 'AntTasks'
 
-includeBuild("../../specs-java-libs/jOptions")
-includeBuild("../../specs-java-libs/SpecsUtils")
+includeBuild("../jOptions")
+includeBuild("../SpecsUtils")

AsmParser/build.gradle

@@ -1,54 +1,45 @@
 plugins {
- 	id 'distribution'
+    id 'distribution'
+    id 'java'
 }
 
-// Java project
-apply plugin: 'java'
-
 java {
+	withSourcesJar()
+
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
 }
 
-
 // Repositories providers
 repositories {
     mavenCentral()
 }
 
 dependencies {
-	testImplementation "junit:junit:4.13.1"     
-	
+	testImplementation "junit:junit:4.13.1"
+
 	implementation ':SpecsUtils'
 	implementation ':jOptions'
 
-    implementation group: 'com.google.code.gson', name: 'gson', version: '2.12.1'
+    implementation 'com.google.code.gson:gson:2.12.1'
 }
 
-java {
-	withSourcesJar()
-}
-
-
 // Project sources
 sourceSets {
-   main {
-      java {
-         srcDir 'src'
-      }
-
-       resources {
-           srcDir 'test'
-       }
-   }   
-
-   test {
-      java {
-         srcDir 'test'
-      }
-
-       resources {
-           srcDir 'test'
-       }
-   }      
+    main {
+        java {
+            srcDir 'src'
+        }
+        resources {
+            srcDir 'resources'
+        }
+    }
+    test {
+        java {
+            srcDir 'test'
+        }
+        resources {
+            srcDir 'test'
+        }
+    }
 }

AsmParser/settings.gradle

@@ -1,4 +1,4 @@
 rootProject.name = 'AsmParser'
 
-includeBuild("../../specs-java-libs/SpecsUtils")
-includeBuild("../../specs-java-libs/jOptions")
+includeBuild("../SpecsUtils")
+includeBuild("../jOptions")

AsmParser/src/pt/up/fe/specs/binarytranslation/asm/parsing/AsmFieldData.java

@@ -15,13 +15,12 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import org.suikasoft.jOptions.DataStore.ADataClass;
 import org.suikasoft.jOptions.Datakey.DataKey;
 import org.suikasoft.jOptions.Datakey.KeyFactory;
 
-import pt.up.fe.specs.util.SpecsCheck;
-
 /**
  * Raw field data as extracted by an {@link IsaParser}
  * 
@@ -98,7 +97,7 @@ public int getReducedOpcode() {
 
     public int getFieldAsBinaryInteger(String fieldName) {
         var valueString = get(AsmFieldData.FIELDS).get(fieldName);
-        SpecsCheck.checkNotNull(valueString, () -> "No value found for field " + fieldName);
+        Objects.requireNonNull(valueString, () -> "No value found for field " + fieldName);
         return Integer.parseInt(valueString, 2);
     }
 

CommonsCompressPlus/build.gradle

@@ -1,38 +1,31 @@
 plugins {
- 	id 'distribution'
+    id 'distribution'
+    id 'java'
 }
 
-// Java project
-apply plugin: 'java'
-
 java {
+    withSourcesJar()
+
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
 }
 
-
 // Repositories providers
 repositories {
     mavenCentral()
 }
 
 dependencies {
-	testImplementation "junit:junit:4.13.1"     
-
-	implementation ':SpecsUtils'
+    implementation ':SpecsUtils'
 
-	implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.27.1'	
-}
-
-java {
-	withSourcesJar()
+    implementation 'org.apache.commons:commons-compress:1.27.1'
 }
 
 // Project sources
 sourceSets {
-   main {
-      java {
-         srcDir 'src'
-      }  
-   }
+    main {
+        java {
+            srcDir 'src'
+        }  
+    }
 }

CommonsCompressPlus/settings.gradle

@@ -1,3 +1,3 @@
 rootProject.name = 'CommonsCompressPlus'
 
-includeBuild("../../specs-java-libs/SpecsUtils")
+includeBuild("../SpecsUtils")

CommonsLangPlus/build.gradle

@@ -17,23 +17,16 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'	
-    implementation group: 'org.apache.commons', name: 'commons-text', version: '1.13.0'	
+    implementation 'org.apache.commons:commons-lang3:3.18.0'
+    implementation 'org.apache.commons:commons-text:1.13.0'
 
     // Testing dependencies
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.10.0'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.5.0'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.5.0'
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
-    testImplementation group: 'org.mockito', name: 'mockito-inline', version: '5.2.0' // For static mocking
-    testRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-launcher'
-}
-
-java {
-    withSourcesJar()
-
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.mockito:mockito-core:5.5.0'
+    testImplementation 'org.mockito:mockito-junit-jupiter:5.5.0'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.mockito:mockito-inline:5.2.0' // For static mocking
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.0'
 }
 
 // Project sources

CommonsLangPlus/src/pt/up/fe/specs/lang/SpecsPlatforms.java

@@ -16,7 +16,8 @@
 import org.apache.commons.lang3.SystemUtils;
 
 /**
- * Utility class providing wrappers around Apache commons-lang methods for system platform identification.
+ * Utility class providing wrappers around Apache commons-lang methods for
+ * system platform identification.
  * <p>
  * Includes methods to check the current operating system and platform details.
  *
@@ -50,7 +51,7 @@ public static boolean isLinux() {
      * @return true if Linux ARM, false otherwise
      */
     public static boolean isLinuxArm() {
-        return SystemUtils.IS_OS_LINUX && "arm".equals(System.getProperty("os.arch").toLowerCase());
+        return SystemUtils.IS_OS_LINUX && "arm".equalsIgnoreCase(System.getProperty("os.arch"));
     }
 
     /**