Skip to content

Commit

Permalink
Merge pull request #8 from hanada31/develop
Browse files Browse the repository at this point in the history
submodule and pom update
  • Loading branch information
hanada31 committed Jul 14, 2023
2 parents 7974178 + cbc86f4 commit 5a8500a
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "soot-dev-iccbot"]
[submodule "soot-dev"]
path = soot-dev
url = https://github.com/LightningRS/soot-dev-iccbot.git
93 changes: 40 additions & 53 deletions CrashTracker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>

<dependencies>
Expand Down Expand Up @@ -102,7 +102,7 @@
<dependency>
<groupId>org.soot-oss</groupId>
<artifactId>soot</artifactId>
<version>4.4.0-SNAPSHOT-ICCBot</version>
<version>4.5.0-SNAPSHOT-ICCBot</version>
<exclusions>
<exclusion>
<groupId>org.smali</groupId>
Expand Down Expand Up @@ -130,44 +130,7 @@
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.soot-oss/soot -->
<!-- https://mvnrepository.com/artifact/io.github.nkbai/soot -->
<!--<dependency>
<groupId>io.github.nkbai</groupId>
<artifactId>soot</artifactId>
<version>4.3.1</version>
<groupId>org.soot-oss</groupId>
<artifactId>soot</artifactId>
<version>4.4.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.smali</groupId>
<artifactId>dexlib2</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>-->


<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -252,7 +215,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>7.7.0</version>
<version>7.6.1</version>
<scope>test</scope>
</dependency>

Expand All @@ -269,16 +232,32 @@
<artifactId>logback-classic</artifactId>
<version>1.2.11</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.9.0</version>
<scope>compile</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/org.sosy-lab/java-smt -->
<dependency>
<groupId>org.sosy-lab</groupId>
<artifactId>java-smt</artifactId>
<version>3.14.3</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>RELEASE</version>
<scope>compile</scope>
</dependency>


</dependencies>

<repositories>

<repositories>
<repository>
<id>sonatype-snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
Expand All @@ -292,15 +271,15 @@
<repository>
<id>itemis-mbeddr</id>
<url>https://projects.itemis.de/nexus/content/repositories/mbeddr/</url>
<layout>default</layout>
<layout>default</layout>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</repositories>

<build>
<plugins>
Expand All @@ -310,14 +289,22 @@
<artifactId>lombok-maven-plugin</artifactId>
<version>1.18.20.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
9 changes: 4 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@


<packaging>pom</packaging>
<modules>
<module>soot-dev</module>
<modules>
<module>CrashTracker</module>
<module>soot-dev</module>
</modules>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>

<dependencies>
Expand Down Expand Up @@ -99,7 +99,6 @@
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion soot-dev
Submodule soot-dev updated 65 files
+45 −0 .github/workflows/ci.yml
+5 −2 README.md
+16 −16 pom.xml
+7 −6 src/main/generated/options/soot/AntTask.java
+89 −114 src/main/generated/options/soot/options/ABCOptions.java
+28 −29 src/main/generated/options/soot/options/AETOptions.java
+30 −40 src/main/generated/options/soot/options/BCMOptions.java
+21 −22 src/main/generated/options/soot/options/CGGOptions.java
+177 −238 src/main/generated/options/soot/options/CGOptions.java
+31 −37 src/main/generated/options/soot/options/CHAOptions.java
+28 −33 src/main/generated/options/soot/options/CPOptions.java
+22 −25 src/main/generated/options/soot/options/FRWOptions.java
+49 −63 src/main/generated/options/soot/options/JBOptions.java
+41 −50 src/main/generated/options/soot/options/JBTROptions.java
+22 −25 src/main/generated/options/soot/options/JJOptions.java
+52 −65 src/main/generated/options/soot/options/LCMOptions.java
+104 −117 src/main/generated/options/soot/options/LockAllocator.java
+12 −13 src/main/generated/options/soot/options/MhpTransformer.java
+30 −36 src/main/generated/options/soot/options/NPCOptions.java
+1 −1 src/main/generated/options/soot/options/Options.java
+535 −613 src/main/generated/options/soot/options/PaddleOptions.java
+24 −27 src/main/generated/options/soot/options/ProfilingOptions.java
+49 −51 src/main/generated/options/soot/options/PurityOptions.java
+24 −28 src/main/generated/options/soot/options/RenameDuplicatedClasses.java
+23 −27 src/main/generated/options/soot/options/SETOptions.java
+93 −113 src/main/generated/options/soot/options/SIOptions.java
+53 −65 src/main/generated/options/soot/options/SMBOptions.java
+47 −56 src/main/generated/options/soot/options/ShimpleOptions.java
+607 −728 src/main/generated/options/soot/options/SparkOptions.java
+1 −1 src/main/generated/singletons/soot/Singletons.java
+26 −15 src/main/java/soot/FastHierarchy.java
+8 −0 src/main/java/soot/Kind.java
+7 −4 src/main/java/soot/LambdaMetaFactory.java
+3 −0 src/main/java/soot/Scene.java
+29 −2 src/main/java/soot/SootClass.java
+12 −1 src/main/java/soot/SourceLocator.java
+11 −3 src/main/java/soot/asm/AsmMethodSource.java
+3 −1 src/main/java/soot/dexpler/DexAnnotation.java
+6 −4 src/main/java/soot/dexpler/DexBody.java
+3 −8 src/main/java/soot/jimple/JimpleBody.java
+1 −1 src/main/java/soot/jimple/internal/AbstractDefinitionStmt.java
+25 −2 src/main/java/soot/jimple/internal/JLookupSwitchStmt.java
+5 −3 src/main/java/soot/jimple/spark/builder/ContextInsensitiveBuilder.java
+3 −3 src/main/java/soot/jimple/toolkits/annotation/nullcheck/NullnessAnalysis.java
+2 −2 src/main/java/soot/jimple/toolkits/callgraph/OnFlyCallGraphBuilder.java
+84 −26 src/main/java/soot/jimple/toolkits/callgraph/VirtualEdgesSummaries.java
+10 −2 src/main/java/soot/jimple/toolkits/ide/icfg/JimpleBasedInterproceduralCFG.java
+1 −1 src/main/java/soot/jimple/toolkits/typing/fast/BytecodeHierarchy.java
+3 −3 src/main/java/soot/plugins/internal/PluginLoader.java
+2 −3 src/main/java/soot/plugins/model/PhasePluginDescription.java
+4 −4 src/main/java/soot/plugins/model/Plugins.java
+7 −1 src/main/java/soot/toDex/DexPrinter.java
+20 −0 src/main/java/soot/toDex/ExprVisitor.java
+42 −10 src/main/java/soot/toDex/RegisterAllocator.java
+9 −21 src/main/java/soot/toolkits/graph/pdg/HashMutablePDG.java
+6 −6 src/main/java/soot/toolkits/scalar/SimpleLocalDefs.java
+7 −1 src/main/resources/virtualedges.xml
+1 −1 src/main/xml/options/ant-task.xsl
+2 −2 src/main/xml/options/make-soot-options.xsl
+1 −1 src/main/xml/singletons/make-singletons.xsl
+104 −0 src/systemTest/java/soot/jimple/toolkit/callgraph/VtaCallGraphBaseClassTest.java
+33 −0 src/systemTest/targets/soot/jimple/toolkit/callgraph/BaseClassFooCallsBar.java
+30 −0 src/systemTest/targets/soot/jimple/toolkit/callgraph/EntryPointCallsSubClassFoo.java
+28 −0 src/systemTest/targets/soot/jimple/toolkit/callgraph/SubClassImplementsBaz.java
+13 −3 src/test/java/soot/asm/backend/targets/MyTestAnnotation.java

0 comments on commit 5a8500a

Please sign in to comment.