remove qilin.core.pag.Field; update dependencies; refactor code

README.md

@@ -9,7 +9,7 @@
 * <b>[DebloaterX](https://github.com/DongjieHe/DebloaterX) published in
   our [OOPSLA paper](https://dongjiehe.github.io/mypaper/OOPSLA2023_DebloaterX_Preprint.pdf) is now available in
   Qilin</b>
-* <b>Qilin now supports Soot-4.4.0</b>
+* <b>Qilin now supports Soot-4.5.0</b>
 
 # Qilin: A fully imperative Java Pointer Analysis Framework.
 

build.gradle

@@ -11,7 +11,7 @@ plugins {
 
 group 'qilin'
 // version format: major.minor.patch
-version '0.9.4-SNAPSHOT'
+version '0.9.5-SNAPSHOT'
 
 java {
     toolchain {
@@ -31,7 +31,8 @@ dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
-task fatJar(type: Jar, dependsOn: ['build']) {
+tasks.register('fatJar', Jar) {
+    dependsOn(tasks.named('build'))
     manifest {
         attributes 'artifact': 'qilin',
                 'Version': getArchiveVersion(),
@@ -56,14 +57,14 @@ subprojects {
     group rootProject.group
     version rootProject.version
 
-    task sourcesJar(type: Jar) {
+    tasks.register('sourcesJar', Jar) {
         archiveClassifier.set('sources')
-        from sourceSets.main.allJava
+        from(sourceSets.main.allSource)
     }
 
-    task javadocJar(type: Jar) {
+    tasks.register('javadocJar', Jar) {
         archiveClassifier.set('javadoc')
-        from javadoc.destinationDir
+        from(javadoc.destinationDir)
     }
 
     java {

qilin.core/build.gradle

@@ -13,9 +13,6 @@ repositories {
 dependencies {
     // api files("${rootDir}/libs/sootclasses-4.4.0-jar-with-dependencies.jar")
     implementation("org.soot-oss:soot:4.5.0")
-    implementation("de.upb.cs.swt:axml:2.1.1")
-    implementation("de.upb.cs.swt:heros:1.2.3")
-    implementation("ca.mcgill.sable:jasmin:3.0.3")
     api(project(':qilin.util'))
 }
 

qilin.pta/build.gradle

@@ -22,14 +22,11 @@ test {
 
 dependencies {
     implementation("org.soot-oss:soot:4.5.0")
-    implementation("de.upb.cs.swt:axml:2.1.1")
-    implementation("de.upb.cs.swt:heros:1.2.3")
-    implementation("ca.mcgill.sable:jasmin:3.0.3")
     testImplementation(project(':qilin.microben'))
     implementation(project(':qilin.core'))
     // https://mvnrepository.com/artifact/commons-cli/commons-cli
-    implementation group: 'commons-cli', name: 'commons-cli', version: '1.2'
-    implementation group: 'com.google.guava', name: 'guava', version: '32.0.1-jre'
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    implementation group: 'commons-cli', name: 'commons-cli', version: '1.7.0'
+    implementation group: 'com.google.guava', name: 'guava', version: '33.2.0-jre'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
 }
 

qilin.pta/src/driver/PTAOption.java

@@ -48,7 +48,11 @@ protected void addOption(String brief, String option, String description) {
      * add option "-brief -option <arg>" with description
      */
     protected void addOption(String brief, String option, String arg, String description) {
-        addOption(OptionBuilder.withLongOpt(option).withArgName(arg).hasArg().withDescription(description).create(brief));
+        OptionBuilder.withLongOpt(option);
+        OptionBuilder.withArgName(arg);
+        OptionBuilder.hasArg();
+        OptionBuilder.withDescription(description);
+        addOption(OptionBuilder.create(brief));
     }
 
     public PTAOption() {
@@ -119,7 +123,6 @@ public void parseCommandLine(String[] args) {
     /**
      * Set all variables from the command line arguments.
      *
-     * @param cmd
      */
     protected void parseCommandLineOptions(CommandLine cmd) {
         // pointer analysis configuration

qilin.util/build.gradle

@@ -11,7 +11,5 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.slf4j:slf4j-api:2.0.3'
-    implementation 'org.slf4j:slf4j-simple:2.0.3'
-    implementation 'com.github.oshi:oshi-core:6.4.0'
+    implementation 'com.github.oshi:oshi-core:6.6.0'
 }