diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 000000000..e45dc3fe0
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,6 @@
+((groovy-mode
+ (c-file-style . "bsd")))
+
+;; Local variables:
+;; flycheck-disabled-checkers: (emacs-lisp emacs-lisp-checkdoc)
+;; End:
diff --git a/.gitignore b/.gitignore
index 22b0d3901..6dd93396c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,11 @@
*.swp
*/bin/
*/bin/*
+*/build/
*~
.metadata/
-com.ibm.wala.cast/lib/
+/.gradle/
+/build/
com.ibm.wala.cast.java.jdt.test/
com.ibm.wala.cast.java.polyglot/lib/
com.ibm.wala.cast.java.test.data/src/JLex/
@@ -25,6 +27,7 @@ com.ibm.wala.cast.js.rhino/lib/
com.ibm.wala.cast.js.test.data/examples-src/ajaxslt/
com.ibm.wala.cast.js.test/examples-src/ajaxslt/
com.ibm.wala.cast.js/lib/
+com.ibm.wala.cast/lib/
com.ibm.wala.core.testdata/*.jar
com.ibm.wala.core.testdata/@dot/
com.ibm.wala.core.testdata/lib/
@@ -34,12 +37,12 @@ com.ibm.wala.core.tests/report
com.ibm.wala.core/@dot
com.ibm.wala.core/com.ibm.wala.core*.jar
com.ibm.wala.core/dat/wala.properties
-com.ibm.wala.dalvik/src/logback.xml
-com.ibm.wala.ide.jdt.test/testdata/
-edu.kit.wala.smali.test/out/
-target/
com.ibm.wala.dalvik.test/data/sample.cup
com.ibm.wala.dalvik.test/parser.java
com.ibm.wala.dalvik.test/report
com.ibm.wala.dalvik.test/sym.java
-results
\ No newline at end of file
+com.ibm.wala.dalvik/src/logback.xml
+com.ibm.wala.ide.jdt.test/testdata/
+edu.kit.wala.smali.test/out/
+results
+target/
diff --git a/.project b/.project
new file mode 100644
index 000000000..31f77fd87
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+
+
+ WALA
+ Project WALA created by Buildship.
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+
+
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..136156472
--- /dev/null
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,3 @@
+#Fri Dec 15 16:39:30 CST 2017
+eclipse.preferences.version=1
+connection.project.dir=
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 000000000..3d64c4091
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,46 @@
+def osgi_platform
+
+switch (System.getProperty('os.name')) {
+ case ~/Mac OS X/:
+ osgi_platform = 'cocoa.macosx.x86_64'
+ break
+ case ~/Windows.*/:
+ osgi_platform = 'win32.win32.x86_64'
+ break
+ case ~/Linux/:
+ osgi_platform = 'gtk.linux.x86_64'
+ break
+}
+
+System.setProperty('osgi.platform', osgi_platform)
+
+subprojects { subproject ->
+ // skip generic Java setup for the few projects that have no Java code whatsoever
+ switch (subproject.name) {
+ case 'com.ibm.wala-repository':
+ case 'com.ibm.wala.cast.js.test.data':
+ case ~/.*_feature/:
+ return
+ }
+
+ apply plugin: 'java'
+
+ repositories {
+ mavenCentral()
+ maven {
+ url 'https://artifacts.alfresco.com/nexus/content/repositories/public/'
+ }
+ maven {
+ url 'https://repo.eclipse.org/content/groups/releases/'
+ }
+ }
+
+ configurations.all {
+ resolutionStrategy {
+ // failOnVersionConflict()
+ dependencySubstitution {
+ substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') with module("org.eclipse.platform:org.eclipse.swt.${System.getProperty('osgi.platform')}:3.+")
+ }
+ }
+ }
+}
diff --git a/com.ibm.wala-repository/.project b/com.ibm.wala-repository/.project
new file mode 100644
index 000000000..e6ecbd37c
--- /dev/null
+++ b/com.ibm.wala-repository/.project
@@ -0,0 +1,17 @@
+
+
+ com.ibm.wala-repository
+ Project com.ibm.wala-repository created by Buildship.
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectnature
+
+
diff --git a/com.ibm.wala-repository/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala-repository/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..d7aa086c9
--- /dev/null
+++ b/com.ibm.wala-repository/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1 @@
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.java.ecj/.classpath b/com.ibm.wala.cast.java.ecj/.classpath
index eca7bdba8..2ebdd5597 100644
--- a/com.ibm.wala.cast.java.ecj/.classpath
+++ b/com.ibm.wala.cast.java.ecj/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.cast.java.ecj/.project b/com.ibm.wala.cast.java.ecj/.project
index d7049f923..8b4a6fb9c 100644
--- a/com.ibm.wala.cast.java.ecj/.project
+++ b/com.ibm.wala.cast.java.ecj/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.java.ecj/build.gradle b/com.ibm.wala.cast.java.ecj/build.gradle
new file mode 100644
index 000000000..7c87e9d13
--- /dev/null
+++ b/com.ibm.wala.cast.java.ecj/build.gradle
@@ -0,0 +1,11 @@
+sourceSets.main.java.srcDir 'src'
+
+dependencies {
+ compile project(':com.ibm.wala.cast')
+ compile project(':com.ibm.wala.cast.java')
+ compile project(':com.ibm.wala.core')
+ compile project(':com.ibm.wala.shrike')
+ compile project(':com.ibm.wala.util')
+ compile 'org.eclipse.jdt:org.eclipse.jdt.core:3.13.50'
+ compile 'org.eclipse.platform:org.eclipse.equinox.common:3.9.0'
+}
diff --git a/com.ibm.wala.cast.java.test.data/.classpath b/com.ibm.wala.cast.java.test.data/.classpath
index 4f83b2397..8d8d85f14 100644
--- a/com.ibm.wala.cast.java.test.data/.classpath
+++ b/com.ibm.wala.cast.java.test.data/.classpath
@@ -1,7 +1,6 @@
-
-
-
+
+
diff --git a/com.ibm.wala.cast.java.test.data/.project b/com.ibm.wala.cast.java.test.data/.project
index 2c6efd271..b87ad17f4 100644
--- a/com.ibm.wala.cast.java.test.data/.project
+++ b/com.ibm.wala.cast.java.test.data/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -34,5 +39,6 @@
org.eclipse.jdt.core.javanature
org.eclipse.pde.PluginNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.java.test/.classpath b/com.ibm.wala.cast.java.test/.classpath
index 4f83b2397..2ebdd5597 100644
--- a/com.ibm.wala.cast.java.test/.classpath
+++ b/com.ibm.wala.cast.java.test/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.cast.java.test/.project b/com.ibm.wala.cast.java.test/.project
index ab02197e1..aa440fc7d 100644
--- a/com.ibm.wala.cast.java.test/.project
+++ b/com.ibm.wala.cast.java.test/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.java.test/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.java.test/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.java.test/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.java.test/build.gradle b/com.ibm.wala.cast.java.test/build.gradle
new file mode 100644
index 000000000..dbae67d16
--- /dev/null
+++ b/com.ibm.wala.cast.java.test/build.gradle
@@ -0,0 +1,13 @@
+sourceSets.main.java.srcDir 'src'
+
+dependencies {
+ compile project(':com.ibm.wala.cast')
+ compile project(':com.ibm.wala.cast.java')
+ compile project(':com.ibm.wala.core')
+ compile project(':com.ibm.wala.core.tests')
+ compile project(':com.ibm.wala.shrike')
+ compile project(':com.ibm.wala.util')
+ compile 'junit:junit:4.11'
+ compile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'
+ compile 'org.osgi:org.osgi.core:4.2.0'
+}
diff --git a/com.ibm.wala.cast.java/.classpath b/com.ibm.wala.cast.java/.classpath
index 4f83b2397..2ebdd5597 100644
--- a/com.ibm.wala.cast.java/.classpath
+++ b/com.ibm.wala.cast.java/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.cast.java/.project b/com.ibm.wala.cast.java/.project
index 335e71eda..33c1a6c5b 100644
--- a/com.ibm.wala.cast.java/.project
+++ b/com.ibm.wala.cast.java/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.java/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.java/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.java/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.java/build.gradle b/com.ibm.wala.cast.java/build.gradle
index 93e68da8e..2fe293ecc 100644
--- a/com.ibm.wala.cast.java/build.gradle
+++ b/com.ibm.wala.cast.java/build.gradle
@@ -1,28 +1,10 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
- maven {
- url "https://repo.eclipse.org/content/groups/releases/"
- }
-}
-
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
-}
+sourceSets.main.java.srcDir 'src'
dependencies {
compile project(':com.ibm.wala.cast')
compile project(':com.ibm.wala.core')
compile project(':com.ibm.wala.shrike')
compile project(':com.ibm.wala.util')
- // https://mvnrepository.com/artifact/org.eclipse.core/org.eclipse.core.runtime
- compile group: 'org.eclipse.core', name: 'org.eclipse.core.runtime', version: '3.10.0.v20140318-2214'
- // https://mvnrepository.com/artifact/org.osgi/org.osgi.core
- compile group: 'org.osgi', name: 'org.osgi.core', version: '4.2.0'
+ // compile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'
+ // compile 'org.osgi:org.osgi.core:4.2.0'
}
-
diff --git a/com.ibm.wala.cast.js.html.nu_validator/.classpath b/com.ibm.wala.cast.js.html.nu_validator/.classpath
index 9993eede2..c36ab88fd 100644
--- a/com.ibm.wala.cast.js.html.nu_validator/.classpath
+++ b/com.ibm.wala.cast.js.html.nu_validator/.classpath
@@ -2,8 +2,7 @@
-
-
-
+
+
diff --git a/com.ibm.wala.cast.js.html.nu_validator/.project b/com.ibm.wala.cast.js.html.nu_validator/.project
index d963a4a29..dbaf5d559 100644
--- a/com.ibm.wala.cast.js.html.nu_validator/.project
+++ b/com.ibm.wala.cast.js.html.nu_validator/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.jdt.core.javanature
org.eclipse.pde.PluginNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.js.html.nu_validator/build.gradle b/com.ibm.wala.cast.js.html.nu_validator/build.gradle
index 06f734fc2..88c76ab73 100644
--- a/com.ibm.wala.cast.js.html.nu_validator/build.gradle
+++ b/com.ibm.wala.cast.js.html.nu_validator/build.gradle
@@ -1,18 +1,5 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
- maven {
- url "https://repo.eclipse.org/content/groups/releases/"
- }
-}
-
sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
+ main.java.srcDirs = ['src', 'tests']
}
dependencies {
@@ -23,7 +10,6 @@ dependencies {
compile project(':com.ibm.wala.cast.test')
compile project(':com.ibm.wala.cast.js.test')
compile project(':com.ibm.wala.core.tests')
- // https://mvnrepository.com/artifact/nu.validator.htmlparser/htmlparser
- compile group: 'nu.validator.htmlparser', name: 'htmlparser', version: '1.4'
+ compile 'nu.validator.htmlparser:htmlparser:1.4'
}
diff --git a/com.ibm.wala.cast.js.nodejs.test/.classpath b/com.ibm.wala.cast.js.nodejs.test/.classpath
index 238fb5a24..8d8d85f14 100644
--- a/com.ibm.wala.cast.js.nodejs.test/.classpath
+++ b/com.ibm.wala.cast.js.nodejs.test/.classpath
@@ -1,8 +1,6 @@
-
-
-
-
+
+
diff --git a/com.ibm.wala.cast.js.nodejs.test/.project b/com.ibm.wala.cast.js.nodejs.test/.project
index 78dc45c70..4334f13f6 100644
--- a/com.ibm.wala.cast.js.nodejs.test/.project
+++ b/com.ibm.wala.cast.js.nodejs.test/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.jdt.core.javanature
org.eclipse.pde.PluginNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.js.nodejs.test/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.js.nodejs.test/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.js.nodejs.test/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.js.nodejs/.classpath b/com.ibm.wala.cast.js.nodejs/.classpath
index 45c15b83d..2c96b5423 100644
--- a/com.ibm.wala.cast.js.nodejs/.classpath
+++ b/com.ibm.wala.cast.js.nodejs/.classpath
@@ -1,28 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/com.ibm.wala.cast.js.nodejs/.project b/com.ibm.wala.cast.js.nodejs/.project
index d9ee4a7e5..b7844d1c4 100644
--- a/com.ibm.wala.cast.js.nodejs/.project
+++ b/com.ibm.wala.cast.js.nodejs/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.jdt.core.javanature
org.eclipse.pde.PluginNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.js.nodejs/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.js.nodejs/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.js.nodejs/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF
index 08f676ddb..7359783e9 100644
--- a/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: com.ibm.wala.cast.js.nodejs
Bundle-Version: 1.4.4.qualifier
-Export-Package: com.ibm.wala.cast.js.nodejs,
- org.json
+Export-Package: com.ibm.wala.cast.js.nodejs
Require-Bundle: com.ibm.wala.cast.js;bundle-version="1.3.10",
com.ibm.wala.cast.js.rhino;bundle-version="1.3.10"
Bundle-ClassPath: lib/json-20160212.jar,
diff --git a/com.ibm.wala.cast.js.nodejs/build.gradle b/com.ibm.wala.cast.js.nodejs/build.gradle
new file mode 100644
index 000000000..d44b9aa72
--- /dev/null
+++ b/com.ibm.wala.cast.js.nodejs/build.gradle
@@ -0,0 +1,14 @@
+sourceSets.main {
+ java.srcDir 'src'
+ resources.srcDir 'dat'
+}
+
+dependencies {
+ compile project(':com.ibm.wala.cast')
+ compile project(':com.ibm.wala.cast.js')
+ compile project(':com.ibm.wala.cast.js.rhino')
+ compile project(':com.ibm.wala.core')
+ compile project(':com.ibm.wala.util')
+ compile 'commons-io:commons-io:2.4'
+ compile 'org.json:json:20160212'
+}
diff --git a/com.ibm.wala.cast.js.rhino.test/.classpath b/com.ibm.wala.cast.js.rhino.test/.classpath
index d338e402d..2200efdb2 100644
--- a/com.ibm.wala.cast.js.rhino.test/.classpath
+++ b/com.ibm.wala.cast.js.rhino.test/.classpath
@@ -1,8 +1,7 @@
-
-
-
+
+
diff --git a/com.ibm.wala.cast.js.rhino.test/.project b/com.ibm.wala.cast.js.rhino.test/.project
index 9b1366589..ae2879a21 100644
--- a/com.ibm.wala.cast.js.rhino.test/.project
+++ b/com.ibm.wala.cast.js.rhino.test/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.js.rhino.test/build.gradle b/com.ibm.wala.cast.js.rhino.test/build.gradle
index b467022fc..cf27d7408 100644
--- a/com.ibm.wala.cast.js.rhino.test/build.gradle
+++ b/com.ibm.wala.cast.js.rhino.test/build.gradle
@@ -1,16 +1,4 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
-}
-
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
-}
+sourceSets.main.java.srcDir 'harness-src'
dependencies {
compile project(':com.ibm.wala.cast.js.rhino')
@@ -22,5 +10,5 @@ dependencies {
compile project(':com.ibm.wala.cast.js')
compile project(':com.ibm.wala.cast.js.test')
compile project(':com.ibm.wala.cast.test')
+ compile 'junit:junit:4.11'
}
-
diff --git a/com.ibm.wala.cast.js.rhino.test/build.properties b/com.ibm.wala.cast.js.rhino.test/build.properties
index e19e77648..77d1a808b 100644
--- a/com.ibm.wala.cast.js.rhino.test/build.properties
+++ b/com.ibm.wala.cast.js.rhino.test/build.properties
@@ -1,6 +1,5 @@
source.. = harness-src/
-output.. = bin/,\
- /com.ibm.wala.cast.js.test.data/examples-src/
+output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/l10n/bundle.properties,\
diff --git a/com.ibm.wala.cast.js.rhino.test/launchers/JsViewerDriver.launch b/com.ibm.wala.cast.js.rhino.test/launchers/JsViewerDriver.launch
index a86923eba..16fc5e68c 100644
--- a/com.ibm.wala.cast.js.rhino.test/launchers/JsViewerDriver.launch
+++ b/com.ibm.wala.cast.js.rhino.test/launchers/JsViewerDriver.launch
@@ -1,13 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.ibm.wala.cast.js.rhino.test/launchers/TestForInLoopHackRhino.launch b/com.ibm.wala.cast.js.rhino.test/launchers/TestForInLoopHackRhino.launch
index 70e3ecc8d..040acce0f 100644
--- a/com.ibm.wala.cast.js.rhino.test/launchers/TestForInLoopHackRhino.launch
+++ b/com.ibm.wala.cast.js.rhino.test/launchers/TestForInLoopHackRhino.launch
@@ -11,6 +11,7 @@
+
diff --git a/com.ibm.wala.cast.js.rhino.test/launchers/TestMozillaBugPagesRhino.launch b/com.ibm.wala.cast.js.rhino.test/launchers/TestMozillaBugPagesRhino.launch
index e979be029..135f3fabb 100644
--- a/com.ibm.wala.cast.js.rhino.test/launchers/TestMozillaBugPagesRhino.launch
+++ b/com.ibm.wala.cast.js.rhino.test/launchers/TestMozillaBugPagesRhino.launch
@@ -15,6 +15,7 @@
+
diff --git a/com.ibm.wala.cast.js.rhino.test/launchers/com.ibm.wala.cast.js.rhino.test-JUnit.launch b/com.ibm.wala.cast.js.rhino.test/launchers/com.ibm.wala.cast.js.rhino.test-JUnit.launch
index f20f3a830..2081a4ca2 100644
--- a/com.ibm.wala.cast.js.rhino.test/launchers/com.ibm.wala.cast.js.rhino.test-JUnit.launch
+++ b/com.ibm.wala.cast.js.rhino.test/launchers/com.ibm.wala.cast.js.rhino.test-JUnit.launch
@@ -22,6 +22,7 @@
+
diff --git a/com.ibm.wala.cast.js.rhino/.classpath b/com.ibm.wala.cast.js.rhino/.classpath
index f984de818..66d8ba80f 100644
--- a/com.ibm.wala.cast.js.rhino/.classpath
+++ b/com.ibm.wala.cast.js.rhino/.classpath
@@ -1,8 +1,7 @@
-
-
-
+
+
diff --git a/com.ibm.wala.cast.js.rhino/.project b/com.ibm.wala.cast.js.rhino/.project
index 0c4c29ceb..56b8e1716 100644
--- a/com.ibm.wala.cast.js.rhino/.project
+++ b/com.ibm.wala.cast.js.rhino/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
index 99259b787..c29505552 100644
--- a/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
@@ -10,27 +10,6 @@ Require-Bundle: com.ibm.wala.cast;bundle-version="1.4.4",
com.ibm.wala.util;bundle-version="1.4.4"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Export-Package: com.ibm.wala.cast.js.translator,
- org.mozilla.classfile,
- org.mozilla.javascript,
- org.mozilla.javascript.annotations,
- org.mozilla.javascript.ast,
- org.mozilla.javascript.commonjs.module,
- org.mozilla.javascript.commonjs.module.provider,
- org.mozilla.javascript.debug,
- org.mozilla.javascript.jdk13,
- org.mozilla.javascript.jdk15,
- org.mozilla.javascript.json,
- org.mozilla.javascript.optimizer,
- org.mozilla.javascript.regexp,
- org.mozilla.javascript.serialize,
- org.mozilla.javascript.tools,
- org.mozilla.javascript.tools.debugger,
- org.mozilla.javascript.tools.debugger.treetable,
- org.mozilla.javascript.tools.idswitch,
- org.mozilla.javascript.tools.jsc,
- org.mozilla.javascript.tools.shell,
- org.mozilla.javascript.xml,
- org.mozilla.javascript.xmlimpl
+Export-Package: com.ibm.wala.cast.js.translator
Bundle-ClassPath: .,
lib/rhino-1.7.6.jar
diff --git a/com.ibm.wala.cast.js.rhino/build.gradle b/com.ibm.wala.cast.js.rhino/build.gradle
index ca1ad73bb..c3b1750b9 100644
--- a/com.ibm.wala.cast.js.rhino/build.gradle
+++ b/com.ibm.wala.cast.js.rhino/build.gradle
@@ -1,26 +1,9 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
- maven {
- url "https://repo.eclipse.org/content/groups/releases/"
- }
-}
-
-sourceSets {
- main {
- java {
- srcDir 'source'
- }
- }
-}
+sourceSets.main.java.srcDir 'source'
dependencies {
compile project(':com.ibm.wala.util')
compile project(':com.ibm.wala.cast')
compile project(':com.ibm.wala.core')
compile project(':com.ibm.wala.cast.js')
- // https://mvnrepository.com/artifact/org.mozilla/rhino
- compile group: 'org.mozilla', name: 'rhino', version: '1.7.7.1'
+ compile 'org.mozilla:rhino:1.7.7.1'
}
-
diff --git a/com.ibm.wala.cast.js.test.data/.project b/com.ibm.wala.cast.js.test.data/.project
index 1c3abaf49..0bf336944 100644
--- a/com.ibm.wala.cast.js.test.data/.project
+++ b/com.ibm.wala.cast.js.test.data/.project
@@ -5,6 +5,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.wst.jsdt.core.javascriptValidator
@@ -24,5 +29,6 @@
org.eclipse.wst.jsdt.core.jsNature
org.eclipse.pde.PluginNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.js.test/.classpath b/com.ibm.wala.cast.js.test/.classpath
index ea32f68e7..2200efdb2 100755
--- a/com.ibm.wala.cast.js.test/.classpath
+++ b/com.ibm.wala.cast.js.test/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch b/com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch
index 98dbca14b..3184e9f7f 100644
--- a/com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch
+++ b/com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch
@@ -1,4 +1,4 @@
-
+
@@ -16,6 +16,7 @@
+
diff --git a/com.ibm.wala.cast.js.test/.project b/com.ibm.wala.cast.js.test/.project
index a3070e2dd..f4c5f3185 100644
--- a/com.ibm.wala.cast.js.test/.project
+++ b/com.ibm.wala.cast.js.test/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.js.test/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.js.test/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.js.test/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.js.test/build.gradle b/com.ibm.wala.cast.js.test/build.gradle
index 6ab93a524..3a5717385 100644
--- a/com.ibm.wala.cast.js.test/build.gradle
+++ b/com.ibm.wala.cast.js.test/build.gradle
@@ -1,16 +1,4 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
-}
-
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
-}
+sourceSets.main.java.srcDir 'harness-src'
dependencies {
compile project(':com.ibm.wala.cast.js.rhino')
@@ -21,5 +9,5 @@ dependencies {
compile project(':com.ibm.wala.core.tests')
compile project(':com.ibm.wala.cast.js')
compile project(':com.ibm.wala.shrike')
+ compile 'junit:junit:4.11'
}
-
diff --git a/com.ibm.wala.cast.js/.classpath b/com.ibm.wala.cast.js/.classpath
index 00116fe19..d66fc5638 100644
--- a/com.ibm.wala.cast.js/.classpath
+++ b/com.ibm.wala.cast.js/.classpath
@@ -2,8 +2,7 @@
-
-
-
+
+
diff --git a/com.ibm.wala.cast.js/.project b/com.ibm.wala.cast.js/.project
index ac04b2cc3..e376220db 100644
--- a/com.ibm.wala.cast.js/.project
+++ b/com.ibm.wala.cast.js/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.js/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.js/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.js/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs
index 86d282952..00846337f 100644
--- a/com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs
@@ -35,7 +35,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
diff --git a/com.ibm.wala.cast.js/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js/META-INF/MANIFEST.MF
index 617cec77c..008aa4737 100644
--- a/com.ibm.wala.cast.js/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js/META-INF/MANIFEST.MF
@@ -26,9 +26,7 @@ Export-Package: .,
com.ibm.wala.cast.js.translator,
com.ibm.wala.cast.js.types,
com.ibm.wala.cast.js.util,
- com.ibm.wala.cast.js.vis,
- net.htmlparser.jericho,
- net.htmlparser.jericho.nodoc
+ com.ibm.wala.cast.js.vis
Require-Bundle: com.ibm.wala.cast,
com.ibm.wala.core,
com.ibm.wala.cast,
diff --git a/com.ibm.wala.cast.js/build.gradle b/com.ibm.wala.cast.js/build.gradle
index 4f1259b34..2576c4998 100644
--- a/com.ibm.wala.cast.js/build.gradle
+++ b/com.ibm.wala.cast.js/build.gradle
@@ -1,18 +1,6 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
- maven {
- url "https://repo.eclipse.org/content/groups/releases/"
- }
-}
-
-sourceSets {
- main {
- java {
- srcDir 'source'
- }
- }
+sourceSets.main {
+ java.srcDir 'source'
+ resources.srcDir 'dat'
}
dependencies {
@@ -21,7 +9,6 @@ dependencies {
compile project(':com.ibm.wala.shrike')
compile project(':com.ibm.wala.core.tests')
compile project(':com.ibm.wala.cast')
- // https://mvnrepository.com/artifact/net.htmlparser.jericho/jericho-html
- compile group: 'net.htmlparser.jericho', name: 'jericho-html', version: '3.2'
+ compile 'commons-io:commons-io:2.4'
+ compile 'net.htmlparser.jericho:jericho-html:3.2'
}
-
diff --git a/com.ibm.wala.cast.test/.classpath b/com.ibm.wala.cast.test/.classpath
index 0d2c5c3f1..c1aad7c0b 100644
--- a/com.ibm.wala.cast.test/.classpath
+++ b/com.ibm.wala.cast.test/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.cast.test/.launchConfigurations/com.ibm.wala.cast.test-JUnit.launch b/com.ibm.wala.cast.test/.launchConfigurations/com.ibm.wala.cast.test-JUnit.launch
index afb7832ff..7fde40e03 100644
--- a/com.ibm.wala.cast.test/.launchConfigurations/com.ibm.wala.cast.test-JUnit.launch
+++ b/com.ibm.wala.cast.test/.launchConfigurations/com.ibm.wala.cast.test-JUnit.launch
@@ -12,6 +12,7 @@
+
diff --git a/com.ibm.wala.cast.test/.project b/com.ibm.wala.cast.test/.project
index f9119f4ad..449471a39 100644
--- a/com.ibm.wala.cast.test/.project
+++ b/com.ibm.wala.cast.test/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast.test/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast.test/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast.test/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast.test/build.gradle b/com.ibm.wala.cast.test/build.gradle
index 87511c8ec..d09b9e2c0 100644
--- a/com.ibm.wala.cast.test/build.gradle
+++ b/com.ibm.wala.cast.test/build.gradle
@@ -1,21 +1,10 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
-}
-
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
-}
+sourceSets.main.java.srcDir 'harness-src/java'
+// TODO: hook up harness-src/c somehow
dependencies {
compile project(':com.ibm.wala.cast')
compile project(':com.ibm.wala.core')
compile project(':com.ibm.wala.core.tests')
compile project(':com.ibm.wala.util')
+ compile 'junit:junit:4.11'
}
-
diff --git a/com.ibm.wala.cast/.classpath b/com.ibm.wala.cast/.classpath
index cd01f6364..9718ab547 100644
--- a/com.ibm.wala.cast/.classpath
+++ b/com.ibm.wala.cast/.classpath
@@ -1,8 +1,7 @@
-
-
-
+
+
diff --git a/com.ibm.wala.cast/.project b/com.ibm.wala.cast/.project
index a58369e50..6a79fa00b 100644
--- a/com.ibm.wala.cast/.project
+++ b/com.ibm.wala.cast/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -34,5 +39,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.cast/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.cast/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.cast/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.cast/META-INF/MANIFEST.MF b/com.ibm.wala.cast/META-INF/MANIFEST.MF
index 7409198b8..99a5134e6 100644
--- a/com.ibm.wala.cast/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast/META-INF/MANIFEST.MF
@@ -25,8 +25,6 @@ Export-Package: com.ibm.wala.cast.analysis.typeInference,
com.ibm.wala.cast.tree.rewrite,
com.ibm.wala.cast.tree.visit,
com.ibm.wala.cast.types,
- com.ibm.wala.cast.util,
- org.apache.commons.io,
- org.apache.commons.io.input
+ com.ibm.wala.cast.util
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/com.ibm.wala.cast/build.gradle b/com.ibm.wala.cast/build.gradle
index efbe58109..ab30439b7 100644
--- a/com.ibm.wala.cast/build.gradle
+++ b/com.ibm.wala.cast/build.gradle
@@ -1,26 +1,9 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
- maven {
- url "https://repo.eclipse.org/content/groups/releases/"
- }
-}
-
-sourceSets {
- main {
- java {
- srcDir 'source'
- }
- }
-}
+sourceSets.main.java.srcDir 'source/java'
dependencies {
compile project(':com.ibm.wala.util')
compile project(':com.ibm.wala.shrike')
compile project(':com.ibm.wala.core')
compile project(':com.ibm.wala.core.tests')
- // https://mvnrepository.com/artifact/commons-io/commons-io
- compile group: 'commons-io', name: 'commons-io', version: '2.4'
+ compile 'commons-io:commons-io:2.4'
}
-
diff --git a/com.ibm.wala.core.testdata/.classpath b/com.ibm.wala.core.testdata/.classpath
index 4f83b2397..8d8d85f14 100644
--- a/com.ibm.wala.core.testdata/.classpath
+++ b/com.ibm.wala.core.testdata/.classpath
@@ -1,7 +1,6 @@
-
-
-
+
+
diff --git a/com.ibm.wala.core.testdata/.project b/com.ibm.wala.core.testdata/.project
index e89838050..b8a287a7c 100644
--- a/com.ibm.wala.core.testdata/.project
+++ b/com.ibm.wala.core.testdata/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.core.testdata/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.core.testdata/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.core.testdata/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.core.tests/.classpath b/com.ibm.wala.core.tests/.classpath
index be35899bb..968b473f1 100644
--- a/com.ibm.wala.core.tests/.classpath
+++ b/com.ibm.wala.core.tests/.classpath
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/com.ibm.wala.core.tests/.project b/com.ibm.wala.core.tests/.project
index bfb108c75..4f7082cf6 100644
--- a/com.ibm.wala.core.tests/.project
+++ b/com.ibm.wala.core.tests/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.core.tests/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.core.tests/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.core.tests/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.core.tests/build.gradle b/com.ibm.wala.core.tests/build.gradle
index 515f25024..36b10f943 100644
--- a/com.ibm.wala.core.tests/build.gradle
+++ b/com.ibm.wala.core.tests/build.gradle
@@ -1,34 +1,15 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
- maven {
- url "https://repo.eclipse.org/content/groups/releases/"
- }
-}
-
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
+sourceSets.main {
+ java.srcDir 'src'
+ resources.srcDir 'dat'
}
dependencies {
+ compile project(':com.ibm.wala.core')
compile project(':com.ibm.wala.shrike')
compile project(':com.ibm.wala.util')
- compile project(':com.ibm.wala.core')
-
- // https://mvnrepository.com/artifact/org.hamcrest/hamcrest-all
- compile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
- // https://mvnrepository.com/artifact/junit/junit
- compile group: 'junit', name: 'junit', version: '4.11'
- // https://mvnrepository.com/artifact/org.apache.ant/ant
- compile group: 'org.apache.ant', name: 'ant', version: '1.8.2'
- // https://mvnrepository.com/artifact/org.eclipse.core/org.eclipse.core.runtime
- compile group: 'org.eclipse.core', name: 'org.eclipse.core.runtime', version: '3.10.0.v20140318-2214'
- // https://mvnrepository.com/artifact/org.osgi/org.osgi.core
- compile group: 'org.osgi', name: 'org.osgi.core', version: '4.2.0'
+ compile 'junit:junit:4.11'
+ compile 'org.apache.ant:ant:1.8.2'
+ compile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'
+ compile 'org.hamcrest:hamcrest-core:1.3'
+ compile 'org.osgi:org.osgi.core:4.2.0'
}
-
diff --git a/com.ibm.wala.core.tests/launchers/ConstructAllIRs.launch b/com.ibm.wala.core.tests/launchers/ConstructAllIRs.launch
index b43baef4e..7c2b24c1c 100644
--- a/com.ibm.wala.core.tests/launchers/ConstructAllIRs.launch
+++ b/com.ibm.wala.core.tests/launchers/ConstructAllIRs.launch
@@ -14,6 +14,7 @@
+
diff --git a/com.ibm.wala.core.tests/launchers/CountParameters.launch b/com.ibm.wala.core.tests/launchers/CountParameters.launch
index 9db2684b1..d15426443 100644
--- a/com.ibm.wala.core.tests/launchers/CountParameters.launch
+++ b/com.ibm.wala.core.tests/launchers/CountParameters.launch
@@ -1,14 +1,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.ibm.wala.core.tests/launchers/ExportTypeHierarchyToXML.launch b/com.ibm.wala.core.tests/launchers/ExportTypeHierarchyToXML.launch
index f1855729e..07f401926 100644
--- a/com.ibm.wala.core.tests/launchers/ExportTypeHierarchyToXML.launch
+++ b/com.ibm.wala.core.tests/launchers/ExportTypeHierarchyToXML.launch
@@ -7,6 +7,7 @@
+
diff --git a/com.ibm.wala.core.tests/launchers/GetEnv.launch b/com.ibm.wala.core.tests/launchers/GetEnv.launch
index ea2696a61..959992233 100644
--- a/com.ibm.wala.core.tests/launchers/GetEnv.launch
+++ b/com.ibm.wala.core.tests/launchers/GetEnv.launch
@@ -1,12 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.ibm.wala.core.tests/launchers/GetLoadedFields.launch b/com.ibm.wala.core.tests/launchers/GetLoadedFields.launch
index e9d2a1cae..2ccbe1ee8 100644
--- a/com.ibm.wala.core.tests/launchers/GetLoadedFields.launch
+++ b/com.ibm.wala.core.tests/launchers/GetLoadedFields.launch
@@ -1,14 +1,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.ibm.wala.core.tests/launchers/JavaViewerDriver.launch b/com.ibm.wala.core.tests/launchers/JavaViewerDriver.launch
index 3f01ab6c1..dab8dfcdb 100644
--- a/com.ibm.wala.core.tests/launchers/JavaViewerDriver.launch
+++ b/com.ibm.wala.core.tests/launchers/JavaViewerDriver.launch
@@ -1,13 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.ibm.wala.core.tests/launchers/PDFCallGraph.launch b/com.ibm.wala.core.tests/launchers/PDFCallGraph.launch
index dda5f77c6..e116ef5dd 100644
--- a/com.ibm.wala.core.tests/launchers/PDFCallGraph.launch
+++ b/com.ibm.wala.core.tests/launchers/PDFCallGraph.launch
@@ -1,4 +1,4 @@
-
+
@@ -7,6 +7,7 @@
+
diff --git a/com.ibm.wala.core.tests/launchers/PDFControlDependenceGraph.launch b/com.ibm.wala.core.tests/launchers/PDFControlDependenceGraph.launch
index 1078a9490..5fecfc30d 100644
--- a/com.ibm.wala.core.tests/launchers/PDFControlDependenceGraph.launch
+++ b/com.ibm.wala.core.tests/launchers/PDFControlDependenceGraph.launch
@@ -1,4 +1,4 @@
-
+
@@ -7,6 +7,7 @@
+
diff --git a/com.ibm.wala.core.tests/launchers/PDFSDG.launch b/com.ibm.wala.core.tests/launchers/PDFSDG.launch
index d60eca042..b05355682 100644
--- a/com.ibm.wala.core.tests/launchers/PDFSDG.launch
+++ b/com.ibm.wala.core.tests/launchers/PDFSDG.launch
@@ -1,4 +1,4 @@
-
+
@@ -7,6 +7,7 @@
+
diff --git a/com.ibm.wala.core.tests/launchers/PDFSlice.launch b/com.ibm.wala.core.tests/launchers/PDFSlice.launch
index afcebf72c..4c2baf0b1 100644
--- a/com.ibm.wala.core.tests/launchers/PDFSlice.launch
+++ b/com.ibm.wala.core.tests/launchers/PDFSlice.launch
@@ -1,4 +1,4 @@
-
+
@@ -7,6 +7,7 @@
+
diff --git a/com.ibm.wala.core.tests/launchers/PDFTypeHierarchy.launch b/com.ibm.wala.core.tests/launchers/PDFTypeHierarchy.launch
index 4659a6ab6..35be2763f 100644
--- a/com.ibm.wala.core.tests/launchers/PDFTypeHierarchy.launch
+++ b/com.ibm.wala.core.tests/launchers/PDFTypeHierarchy.launch
@@ -1,4 +1,4 @@
-
+
@@ -7,6 +7,7 @@
+
diff --git a/com.ibm.wala.core.tests/launchers/PDFWalaIR.launch b/com.ibm.wala.core.tests/launchers/PDFWalaIR.launch
index 46072f221..1a495473b 100644
--- a/com.ibm.wala.core.tests/launchers/PDFWalaIR.launch
+++ b/com.ibm.wala.core.tests/launchers/PDFWalaIR.launch
@@ -7,6 +7,7 @@
+
diff --git a/com.ibm.wala.core.tests/launchers/wala.core short profile (non-windows).launch b/com.ibm.wala.core.tests/launchers/wala.core short profile (non-windows).launch
index 4eb8c29ab..dc000c027 100644
--- a/com.ibm.wala.core.tests/launchers/wala.core short profile (non-windows).launch
+++ b/com.ibm.wala.core.tests/launchers/wala.core short profile (non-windows).launch
@@ -20,6 +20,7 @@
+
diff --git a/com.ibm.wala.core.tests/launchers/wala.core short profile.launch b/com.ibm.wala.core.tests/launchers/wala.core short profile.launch
index ac770da95..1e8df5289 100644
--- a/com.ibm.wala.core.tests/launchers/wala.core short profile.launch
+++ b/com.ibm.wala.core.tests/launchers/wala.core short profile.launch
@@ -1,26 +1,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.ibm.wala.core.tests/launchers/wala.core.launch b/com.ibm.wala.core.tests/launchers/wala.core.launch
index 2988ab875..cc9656aa1 100644
--- a/com.ibm.wala.core.tests/launchers/wala.core.launch
+++ b/com.ibm.wala.core.tests/launchers/wala.core.launch
@@ -23,6 +23,7 @@
+
diff --git a/com.ibm.wala.core/.classpath b/com.ibm.wala.core/.classpath
index 963e101b1..a632801ae 100644
--- a/com.ibm.wala.core/.classpath
+++ b/com.ibm.wala.core/.classpath
@@ -1,9 +1,9 @@
-
-
+
+
diff --git a/com.ibm.wala.core/.project b/com.ibm.wala.core/.project
index aaddaebe9..adf76bfbb 100644
--- a/com.ibm.wala.core/.project
+++ b/com.ibm.wala.core/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.core/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.core/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.core/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.core/build.gradle b/com.ibm.wala.core/build.gradle
index 31788be4c..1c8c1ded6 100644
--- a/com.ibm.wala.core/build.gradle
+++ b/com.ibm.wala.core/build.gradle
@@ -1,19 +1,12 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
-}
-
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
+sourceSets.main {
+ java.srcDir 'src'
+ resources.srcDirs = [
+ 'dat',
+ 'lib',
+ ]
}
dependencies {
compile project(':com.ibm.wala.util')
compile project(':com.ibm.wala.shrike')
}
-
diff --git a/com.ibm.wala.dalvik.test/.classpath b/com.ibm.wala.dalvik.test/.classpath
index b31dd2278..8d8d85f14 100644
--- a/com.ibm.wala.dalvik.test/.classpath
+++ b/com.ibm.wala.dalvik.test/.classpath
@@ -1,9 +1,6 @@
-
-
-
-
-
+
+
diff --git a/com.ibm.wala.dalvik.test/.project b/com.ibm.wala.dalvik.test/.project
index 741fa3f33..53aa2fe01 100644
--- a/com.ibm.wala.dalvik.test/.project
+++ b/com.ibm.wala.dalvik.test/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.dalvik.test/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.dalvik.test/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.dalvik.test/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.dalvik/.classpath b/com.ibm.wala.dalvik/.classpath
index 5306cac98..2ebdd5597 100644
--- a/com.ibm.wala.dalvik/.classpath
+++ b/com.ibm.wala.dalvik/.classpath
@@ -1,15 +1,7 @@
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/com.ibm.wala.dalvik/.project b/com.ibm.wala.dalvik/.project
index 62b1ec3d1..f3c29d72d 100644
--- a/com.ibm.wala.dalvik/.project
+++ b/com.ibm.wala.dalvik/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.jdt.core.javanature
org.eclipse.pde.PluginNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.dalvik/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.dalvik/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.dalvik/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.dalvik/META-INF/MANIFEST.MF b/com.ibm.wala.dalvik/META-INF/MANIFEST.MF
index bc3d9aa10..fc872e483 100644
--- a/com.ibm.wala.dalvik/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.dalvik/META-INF/MANIFEST.MF
@@ -8,24 +8,7 @@ Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3",
com.ibm.wala.cast;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Export-Package: com.google.common.annotations,
- com.google.common.base,
- com.google.common.base.internal,
- com.google.common.cache,
- com.google.common.collect,
- com.google.common.escape,
- com.google.common.eventbus,
- com.google.common.graph,
- com.google.common.hash,
- com.google.common.html,
- com.google.common.io,
- com.google.common.math,
- com.google.common.net,
- com.google.common.primitives,
- com.google.common.reflect,
- com.google.common.util.concurrent,
- com.google.common.xml,
- com.google.thirdparty.publicsuffix,
+Export-Package:
com.ibm.wala.dalvik.analysis.typeInference,
com.ibm.wala.dalvik.classLoader,
com.ibm.wala.dalvik.dex.instructions,
@@ -38,53 +21,7 @@ Export-Package: com.google.common.annotations,
com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa,
com.ibm.wala.dalvik.ssa,
com.ibm.wala.dalvik.util,
- com.ibm.wala.dalvik.util.androidEntryPoints,
- org.apache.commons.cli,
- org.apache.commons.io,
- org.apache.commons.io.comparator,
- org.apache.commons.io.filefilter,
- org.apache.commons.io.input,
- org.apache.commons.io.monitor,
- org.apache.commons.io.output,
- org.jf.dexlib2,
- org.jf.dexlib2.analysis,
- org.jf.dexlib2.analysis.reflection,
- org.jf.dexlib2.analysis.reflection.util,
- org.jf.dexlib2.analysis.util,
- org.jf.dexlib2.base,
- org.jf.dexlib2.base.reference,
- org.jf.dexlib2.base.value,
- org.jf.dexlib2.builder,
- org.jf.dexlib2.builder.debug,
- org.jf.dexlib2.builder.instruction,
- org.jf.dexlib2.dexbacked,
- org.jf.dexlib2.dexbacked.instruction,
- org.jf.dexlib2.dexbacked.raw,
- org.jf.dexlib2.dexbacked.raw.util,
- org.jf.dexlib2.dexbacked.reference,
- org.jf.dexlib2.dexbacked.util,
- org.jf.dexlib2.dexbacked.value,
- org.jf.dexlib2.iface,
- org.jf.dexlib2.iface.debug,
- org.jf.dexlib2.iface.instruction,
- org.jf.dexlib2.iface.instruction.formats,
- org.jf.dexlib2.iface.reference,
- org.jf.dexlib2.iface.value,
- org.jf.dexlib2.immutable,
- org.jf.dexlib2.immutable.debug,
- org.jf.dexlib2.immutable.instruction,
- org.jf.dexlib2.immutable.reference,
- org.jf.dexlib2.immutable.util,
- org.jf.dexlib2.immutable.value,
- org.jf.dexlib2.rewriter,
- org.jf.dexlib2.util,
- org.jf.dexlib2.writer,
- org.jf.dexlib2.writer.builder,
- org.jf.dexlib2.writer.io,
- org.jf.dexlib2.writer.pool,
- org.jf.dexlib2.writer.util,
- org.jf.util,
- org.jf.util.jcommander
+ com.ibm.wala.dalvik.util.androidEntryPoints
Bundle-ClassPath: .,
lib/commons-cli-1.4.jar,
lib/commons-io-2.4.jar,
diff --git a/com.ibm.wala.dalvik/build.gradle b/com.ibm.wala.dalvik/build.gradle
index b3716af3e..e2a05766f 100644
--- a/com.ibm.wala.dalvik/build.gradle
+++ b/com.ibm.wala.dalvik/build.gradle
@@ -1,29 +1,10 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
- maven {
- url "https://repo.eclipse.org/content/groups/releases/"
- }
-}
-
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
-}
+sourceSets.main.java.srcDir 'src'
dependencies {
compile project(':com.ibm.wala.util')
compile project(':com.ibm.wala.shrike')
compile project(':com.ibm.wala.core')
compile project(':com.ibm.wala.cast')
- //compile files('libs/dexlib-1.3.4-dev.jar')
- // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
- // https://mvnrepository.com/artifact/org.smali/dexlib2
- compile group: 'org.smali', name: 'dexlib2', version: '2.2.1'
- compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.2'
+ compile 'org.smali:dexlib2:2.2.1'
+ compile 'org.slf4j:slf4j-api:1.7.2'
}
-
diff --git a/com.ibm.wala.ide.jdt.test/.classpath b/com.ibm.wala.ide.jdt.test/.classpath
index 0765cbb5b..8d8d85f14 100644
--- a/com.ibm.wala.ide.jdt.test/.classpath
+++ b/com.ibm.wala.ide.jdt.test/.classpath
@@ -1,8 +1,6 @@
-
-
-
-
+
+
diff --git a/com.ibm.wala.ide.jdt.test/.project b/com.ibm.wala.ide.jdt.test/.project
index 82bcfaa91..1bd73dde2 100644
--- a/com.ibm.wala.ide.jdt.test/.project
+++ b/com.ibm.wala.ide.jdt.test/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.ide.jdt.test/launchers/ECJJavaIRTest.launch b/com.ibm.wala.ide.jdt.test/launchers/ECJJavaIRTest.launch
index d56e5d121..7b1538a43 100644
--- a/com.ibm.wala.ide.jdt.test/launchers/ECJJavaIRTest.launch
+++ b/com.ibm.wala.ide.jdt.test/launchers/ECJJavaIRTest.launch
@@ -11,6 +11,7 @@
+
diff --git a/com.ibm.wala.ide.jdt/.classpath b/com.ibm.wala.ide.jdt/.classpath
index 3b43e981f..66d8ba80f 100644
--- a/com.ibm.wala.ide.jdt/.classpath
+++ b/com.ibm.wala.ide.jdt/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.ide.jdt/.project b/com.ibm.wala.ide.jdt/.project
index b0fb255ad..22d56f12c 100644
--- a/com.ibm.wala.ide.jdt/.project
+++ b/com.ibm.wala.ide.jdt/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.ide.jdt/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.ide.jdt/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.ide.jdt/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.ide.jdt/build.gradle b/com.ibm.wala.ide.jdt/build.gradle
new file mode 100644
index 000000000..53d606b0c
--- /dev/null
+++ b/com.ibm.wala.ide.jdt/build.gradle
@@ -0,0 +1,18 @@
+sourceSets.main.java.srcDir 'source'
+
+dependencies {
+ compile project(':com.ibm.wala.cast')
+ compile project(':com.ibm.wala.cast.java')
+ compile project(':com.ibm.wala.cast.java.ecj')
+ compile project(':com.ibm.wala.core')
+ compile project(':com.ibm.wala.ide')
+ compile project(':com.ibm.wala.util')
+ compile 'org.eclipse.jdt:org.eclipse.jdt.core:3.13.50'
+ compile 'org.eclipse.platform:org.eclipse.core.jobs:3.9.1'
+ compile 'org.eclipse.platform:org.eclipse.core.resources:3.12.0'
+ compile 'org.eclipse.platform:org.eclipse.equinox.app:1.3.400'
+ compile 'org.eclipse.platform:org.eclipse.equinox.common:3.9.0'
+ compile 'org.eclipse.platform:org.eclipse.jface:3.13.1'
+ compile 'org.eclipse.platform:org.eclipse.osgi:3.12.50'
+ compile 'org.eclipse.platform:org.eclipse.ui.workbench:3.110.1'
+}
diff --git a/com.ibm.wala.ide.jsdt.tests/.classpath b/com.ibm.wala.ide.jsdt.tests/.classpath
index 01836c484..2ebdd5597 100644
--- a/com.ibm.wala.ide.jsdt.tests/.classpath
+++ b/com.ibm.wala.ide.jsdt.tests/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.ide.jsdt.tests/.project b/com.ibm.wala.ide.jsdt.tests/.project
index 7d435fadc..f185a39c5 100644
--- a/com.ibm.wala.ide.jsdt.tests/.project
+++ b/com.ibm.wala.ide.jsdt.tests/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.jdt.core.javanature
org.eclipse.pde.PluginNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.jdt.core.prefs
index 9f91c7ae4..29b67ed73 100644
--- a/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.jdt.core.prefs
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=error
@@ -35,7 +36,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=error
org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
@@ -90,6 +91,7 @@ org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
diff --git a/com.ibm.wala.ide.jsdt.tests/build.gradle b/com.ibm.wala.ide.jsdt.tests/build.gradle
new file mode 100644
index 000000000..c42064270
--- /dev/null
+++ b/com.ibm.wala.ide.jsdt.tests/build.gradle
@@ -0,0 +1,16 @@
+sourceSets.main.java.srcDir 'src'
+
+dependencies {
+ compile project(':com.ibm.wala.cast')
+ compile project(':com.ibm.wala.cast.js')
+ compile project(':com.ibm.wala.cast.js.rhino')
+ compile project(':com.ibm.wala.core')
+ compile project(':com.ibm.wala.ide.jsdt')
+ compile project(':com.ibm.wala.ide.tests')
+ compile project(':com.ibm.wala.util')
+ compile 'junit:junit:4.11'
+ compile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'
+ compile 'org.eclipse.platform:org.eclipse.core.runtime:3.13.0'
+ compile 'org.eclipse.platform:org.eclipse.equinox.common:3.9.0'
+ compile 'org.eclipse.wst.jsdt:core:1.0.201.v2010012803'
+}
diff --git a/com.ibm.wala.ide.jsdt/.classpath b/com.ibm.wala.ide.jsdt/.classpath
index 72333afef..66d8ba80f 100644
--- a/com.ibm.wala.ide.jsdt/.classpath
+++ b/com.ibm.wala.ide.jsdt/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.ide.jsdt/.project b/com.ibm.wala.ide.jsdt/.project
index e7e1000b2..f9e58ef17 100644
--- a/com.ibm.wala.ide.jsdt/.project
+++ b/com.ibm.wala.ide.jsdt/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.ide.jsdt/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.ide.jsdt/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.ide.jsdt/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
index 54051f85a..5b5e13b20 100644
--- a/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
@@ -19,10 +19,13 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui;bundle-version="3.104.0",
org.eclipse.ui.ide;bundle-version="3.8.2",
org.eclipse.pde;bundle-version="3.8.0",
- org.eclipse.pde.core;bundle-version="3.8.1"
+ org.eclipse.pde.core;bundle-version="3.8.1",
+ com.ibm.wala.ide.jsdt
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.wst.jsdt.internal.corext.callhierarchy
+Import-Package: com.ibm.wala.ide.util,
+ org.eclipse.jdt.internal.compiler.tool,
+ org.eclipse.wst.jsdt.internal.corext.callhierarchy
Export-Package: com.ibm.wala.cast.js.client,
com.ibm.wala.ide.jsdt,
com.ibm.wala.ide.util
diff --git a/com.ibm.wala.ide.jsdt/build.gradle b/com.ibm.wala.ide.jsdt/build.gradle
new file mode 100644
index 000000000..48cf0247f
--- /dev/null
+++ b/com.ibm.wala.ide.jsdt/build.gradle
@@ -0,0 +1,17 @@
+sourceSets.main.java.srcDir 'source'
+
+dependencies {
+ compile project(':com.ibm.wala.cast')
+ compile project(':com.ibm.wala.cast.js')
+ compile project(':com.ibm.wala.cast.js.rhino')
+ compile project(':com.ibm.wala.core')
+ compile project(':com.ibm.wala.ide')
+ compile project(':com.ibm.wala.util')
+ compile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'
+ compile 'org.eclipse.platform:org.eclipse.core.resources:3.12.0'
+ compile 'org.eclipse.platform:org.eclipse.core.runtime:3.13.0'
+ compile 'org.eclipse.platform:org.eclipse.equinox.common:3.9.0'
+ compile 'org.eclipse.wst.jsdt:core:1.0.201.v2010012803'
+ compile 'org.eclipse.wst.jsdt:ui:1.0.201.v2010012803'
+ runtime 'org.eclipse.platform:org.eclipse.osgi:3.12.50'
+}
diff --git a/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JsdtUtil.java b/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JsdtUtil.java
index a0d648ad0..4c0e794ab 100644
--- a/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JsdtUtil.java
+++ b/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JsdtUtil.java
@@ -59,7 +59,6 @@ import com.ibm.wala.util.collections.Pair;
import com.ibm.wala.util.graph.Graph;
import com.ibm.wala.util.graph.impl.SlowSparseNumberedGraph;
-@SuppressWarnings("restriction")
public class JsdtUtil {
public static URL getPrologueFile(String file, Plugin plugin) {
diff --git a/com.ibm.wala.ide.tests/.classpath b/com.ibm.wala.ide.tests/.classpath
index 4f83b2397..2ebdd5597 100644
--- a/com.ibm.wala.ide.tests/.classpath
+++ b/com.ibm.wala.ide.tests/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.ide.tests/.project b/com.ibm.wala.ide.tests/.project
index ab89b3371..9f694b7cc 100644
--- a/com.ibm.wala.ide.tests/.project
+++ b/com.ibm.wala.ide.tests/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.ide.tests/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.ide.tests/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.ide.tests/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.ide.tests/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.ide.tests/.settings/org.eclipse.jdt.core.prefs
index 929890dee..32b41283b 100644
--- a/com.ibm.wala.ide.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.ide.tests/.settings/org.eclipse.jdt.core.prefs
@@ -17,6 +17,7 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=error
@@ -34,7 +35,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=error
org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
@@ -90,6 +91,7 @@ org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
diff --git a/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF b/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
index 707b5d0b4..24f31960d 100644
--- a/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
@@ -4,20 +4,9 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: com.ibm.wala.ide.tests;singleton:=true
Bundle-Version: 1.4.4.qualifier
Bundle-Vendor: %providerName
-Require-Bundle: com.ibm.wala.shrike,
- com.ibm.wala.core,
+Require-Bundle: com.ibm.wala.core,
com.ibm.wala.ide,
- com.ibm.wala.ide.jdt;bundle-version="1.4.4.qualifier",
- com.ibm.wala.core.tests,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.osgi.services;bundle-version="3.3.100";resolution:=optional,
- org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1";resolution:=optional,
- org.eclipse.e4.core.di;bundle-version="1.2.0";resolution:=optional,
- org.junit;bundle-version="4.0.0"
+ com.ibm.wala.core.tests
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
diff --git a/com.ibm.wala.ide.tests/build.gradle b/com.ibm.wala.ide.tests/build.gradle
new file mode 100644
index 000000000..91109c91f
--- /dev/null
+++ b/com.ibm.wala.ide.tests/build.gradle
@@ -0,0 +1,18 @@
+sourceSets.main.java.srcDir 'src'
+
+dependencies {
+ compile project(':com.ibm.wala.core')
+ compile project(':com.ibm.wala.core.tests')
+ compile project(':com.ibm.wala.ide')
+ compile project(':com.ibm.wala.util')
+ compile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'
+ compile 'org.eclipse.platform:org.eclipse.core.resources:3.12.0'
+ compile 'org.eclipse.platform:org.eclipse.core.runtime:3.13.0'
+ compile 'org.eclipse.platform:org.eclipse.equinox.common:3.9.0'
+ compile 'org.eclipse.platform:org.eclipse.jface:3.13.1'
+ compile 'org.eclipse.platform:org.eclipse.osgi:3.12.50'
+ compile 'org.eclipse.platform:org.eclipse.ui.ide:3.13.1'
+ compile 'org.eclipse.platform:org.eclipse.ui.workbench:3.110.1'
+ compile 'org.osgi:org.osgi.core:4.2.0'
+ runtime project(':com.ibm.wala.ide.jdt')
+}
diff --git a/com.ibm.wala.ide.tests/launchers/IFDSExplorerExample.launch b/com.ibm.wala.ide.tests/launchers/IFDSExplorerExample.launch
index f31007ee9..f56cf1bcd 100644
--- a/com.ibm.wala.ide.tests/launchers/IFDSExplorerExample.launch
+++ b/com.ibm.wala.ide.tests/launchers/IFDSExplorerExample.launch
@@ -14,6 +14,7 @@
+
diff --git a/com.ibm.wala.ide.tests/launchers/SWTCallGraph - OCaml - ipascal.launch b/com.ibm.wala.ide.tests/launchers/SWTCallGraph - OCaml - ipascal.launch
index 82ee595e0..2a221fbdd 100644
--- a/com.ibm.wala.ide.tests/launchers/SWTCallGraph - OCaml - ipascal.launch
+++ b/com.ibm.wala.ide.tests/launchers/SWTCallGraph - OCaml - ipascal.launch
@@ -6,6 +6,7 @@
+
diff --git a/com.ibm.wala.ide.tests/launchers/SWTCallGraph.launch b/com.ibm.wala.ide.tests/launchers/SWTCallGraph.launch
index 78d71de8d..e7836ac1e 100644
--- a/com.ibm.wala.ide.tests/launchers/SWTCallGraph.launch
+++ b/com.ibm.wala.ide.tests/launchers/SWTCallGraph.launch
@@ -7,6 +7,7 @@
+
diff --git a/com.ibm.wala.ide.tests/launchers/SWTPointsTo.launch b/com.ibm.wala.ide.tests/launchers/SWTPointsTo.launch
index 8e4a8d3a4..7d1018e4e 100644
--- a/com.ibm.wala.ide.tests/launchers/SWTPointsTo.launch
+++ b/com.ibm.wala.ide.tests/launchers/SWTPointsTo.launch
@@ -6,6 +6,7 @@
+
diff --git a/com.ibm.wala.ide.tests/launchers/SWTTypeHierarchy.launch b/com.ibm.wala.ide.tests/launchers/SWTTypeHierarchy.launch
index d48ab3670..38ff08d91 100644
--- a/com.ibm.wala.ide.tests/launchers/SWTTypeHierarchy.launch
+++ b/com.ibm.wala.ide.tests/launchers/SWTTypeHierarchy.launch
@@ -6,6 +6,7 @@
+
diff --git a/com.ibm.wala.ide/.classpath b/com.ibm.wala.ide/.classpath
index 4f83b2397..2ebdd5597 100644
--- a/com.ibm.wala.ide/.classpath
+++ b/com.ibm.wala.ide/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.ide/.project b/com.ibm.wala.ide/.project
index faece03a3..d49b55092 100644
--- a/com.ibm.wala.ide/.project
+++ b/com.ibm.wala.ide/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.ide/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.ide/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.ide/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.ide/build.gradle b/com.ibm.wala.ide/build.gradle
new file mode 100644
index 000000000..a7cc51019
--- /dev/null
+++ b/com.ibm.wala.ide/build.gradle
@@ -0,0 +1,15 @@
+sourceSets.main.java.srcDir 'src'
+
+dependencies {
+ compile project(':com.ibm.wala.core')
+ compile project(':com.ibm.wala.util')
+ compile 'org.eclipse.pde:org.eclipse.pde.core:3.11.1'
+ compile 'org.eclipse.platform:org.eclipse.core.commands:3.9.0'
+ compile 'org.eclipse.platform:org.eclipse.core.resources:3.12.0'
+ compile 'org.eclipse.platform:org.eclipse.core.runtime:3.13.0'
+ compile 'org.eclipse.platform:org.eclipse.equinox.common:3.9.0'
+ compile 'org.eclipse.platform:org.eclipse.jface:3.13.1'
+ compile 'org.eclipse.platform:org.eclipse.osgi:3.12.50'
+ compile 'org.eclipse.platform:org.eclipse.swt.${osgi.platform}:3.106.1'
+ compile 'org.eclipse.platform:org.eclipse.ui.workbench:3.110.1'
+}
diff --git a/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java b/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java
index 826c8f8bc..976419a6d 100644
--- a/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java
+++ b/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java
@@ -60,7 +60,6 @@ import com.ibm.wala.util.debug.Assertions;
* SOURCE_FOR_PROJ_AND_LINKED_PROJS is specified.
*
*/
-@SuppressWarnings("restriction")
public abstract class EclipseProjectPath {
protected abstract P makeProject(IProject p);
diff --git a/com.ibm.wala.ide_feature/.project b/com.ibm.wala.ide_feature/.project
index 6b957cabe..10ea23bc3 100644
--- a/com.ibm.wala.ide_feature/.project
+++ b/com.ibm.wala.ide_feature/.project
@@ -5,6 +5,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.FeatureBuilder
@@ -13,5 +18,6 @@
org.eclipse.pde.FeatureNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.ide_feature/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.ide_feature/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.ide_feature/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.scandroid/.classpath b/com.ibm.wala.scandroid/.classpath
index 3b43e981f..66d8ba80f 100644
--- a/com.ibm.wala.scandroid/.classpath
+++ b/com.ibm.wala.scandroid/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.scandroid/.project b/com.ibm.wala.scandroid/.project
index b122a8155..fe822ce56 100644
--- a/com.ibm.wala.scandroid/.project
+++ b/com.ibm.wala.scandroid/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.scandroid/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.scandroid/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.scandroid/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs
index 10cf5621c..474bdc4c2 100644
--- a/com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs
@@ -11,6 +11,7 @@ org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -28,7 +29,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=error
org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
@@ -76,6 +77,7 @@ org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
diff --git a/com.ibm.wala.scandroid/build.gradle b/com.ibm.wala.scandroid/build.gradle
new file mode 100644
index 000000000..afc418287
--- /dev/null
+++ b/com.ibm.wala.scandroid/build.gradle
@@ -0,0 +1,10 @@
+sourceSets.main.java.srcDir 'source'
+
+dependencies {
+ compile project(':com.ibm.wala.core')
+ compile project(':com.ibm.wala.dalvik')
+ compile project(':com.ibm.wala.shrike')
+ compile project(':com.ibm.wala.util')
+ compile 'com.google.guava:guava:18.0'
+ compile 'commons-cli:commons-cli:1.4'
+}
diff --git a/com.ibm.wala.shrike/.classpath b/com.ibm.wala.shrike/.classpath
index 4f83b2397..2ebdd5597 100644
--- a/com.ibm.wala.shrike/.classpath
+++ b/com.ibm.wala.shrike/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.shrike/.project b/com.ibm.wala.shrike/.project
index 92e255dc0..1f6c721aa 100644
--- a/com.ibm.wala.shrike/.project
+++ b/com.ibm.wala.shrike/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.shrike/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.shrike/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.shrike/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.shrike/build.gradle b/com.ibm.wala.shrike/build.gradle
index 7e95368ed..09e9c2ff4 100644
--- a/com.ibm.wala.shrike/build.gradle
+++ b/com.ibm.wala.shrike/build.gradle
@@ -1,18 +1,5 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
-}
-
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
-}
+sourceSets.main.java.srcDir 'src'
dependencies {
compile project(':com.ibm.wala.util')
}
-
diff --git a/com.ibm.wala.tests.ide_feature/.project b/com.ibm.wala.tests.ide_feature/.project
index 9b48674b4..c6f0f2cf6 100644
--- a/com.ibm.wala.tests.ide_feature/.project
+++ b/com.ibm.wala.tests.ide_feature/.project
@@ -5,6 +5,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.FeatureBuilder
@@ -13,5 +18,6 @@
org.eclipse.pde.FeatureNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.tests.ide_feature/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.tests.ide_feature/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.tests.ide_feature/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.tests_feature/.project b/com.ibm.wala.tests_feature/.project
index 4e348e734..d391eb4f4 100644
--- a/com.ibm.wala.tests_feature/.project
+++ b/com.ibm.wala.tests_feature/.project
@@ -5,6 +5,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.FeatureBuilder
@@ -13,5 +18,6 @@
org.eclipse.pde.FeatureNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.tests_feature/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.tests_feature/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.tests_feature/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.util/.classpath b/com.ibm.wala.util/.classpath
index 01836c484..2ebdd5597 100644
--- a/com.ibm.wala.util/.classpath
+++ b/com.ibm.wala.util/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.util/.project b/com.ibm.wala.util/.project
index dcb1507b3..a1cce6a5a 100644
--- a/com.ibm.wala.util/.project
+++ b/com.ibm.wala.util/.project
@@ -10,6 +10,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.ManifestBuilder
@@ -24,5 +29,6 @@
org.eclipse.jdt.core.javanature
org.eclipse.pde.PluginNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala.util/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala.util/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala.util/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/com.ibm.wala.util/build.gradle b/com.ibm.wala.util/build.gradle
index f83fbd598..1a33ef200 100644
--- a/com.ibm.wala.util/build.gradle
+++ b/com.ibm.wala.util/build.gradle
@@ -1,14 +1 @@
-apply plugin: 'java'
-
-repositories {
- mavenCentral()
-}
-
-sourceSets {
- main {
- java {
- srcDir 'src'
- }
- }
-}
-
+sourceSets.main.java.srcDir 'src'
diff --git a/com.ibm.wala_feature/.project b/com.ibm.wala_feature/.project
index 0e1918b04..5b898bb4f 100644
--- a/com.ibm.wala_feature/.project
+++ b/com.ibm.wala_feature/.project
@@ -5,6 +5,11 @@
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
org.eclipse.pde.FeatureBuilder
@@ -13,5 +18,6 @@
org.eclipse.pde.FeatureNature
+ org.eclipse.buildship.core.gradleprojectnature
diff --git a/com.ibm.wala_feature/.settings/org.eclipse.buildship.core.prefs b/com.ibm.wala_feature/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..2283e1f1e
--- /dev/null
+++ b/com.ibm.wala_feature/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+connection.project.dir=..
diff --git a/settings.gradle b/settings.gradle
index 1b2c65ef1..6e4ff6be8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,35 @@
-include 'com.ibm.wala.cast', 'com.ibm.wala.cast.test', 'com.ibm.wala.cast.java', 'com.ibm.wala.core', 'com.ibm.wala.cast.java.test', 'com.ibm.wala.core.testdata', 'com.ibm.wala.cast.java.test.data', 'com.ibm.wala.core.tests', 'com.ibm.wala.cast.js', 'com.ibm.wala.dalvik', 'com.ibm.wala.cast.js.html.nu_validator', 'com.ibm.wala.shrike', 'com.ibm.wala.cast.js.rhino', 'com.ibm.wala.tests-feature', 'com.ibm.wala.cast.js.rhino.test', 'com.ibm.wala.tests.ide-feature', 'com.ibm.wala.cast.js.test', 'com.ibm.wala.util', 'com.ibm.wala-feature', 'com.ibm.wala.cast.js.test.data'
+include(
+ 'com.ibm.wala-repository',
+ 'com.ibm.wala.cast',
+ 'com.ibm.wala.cast.java',
+ 'com.ibm.wala.cast.java.ecj',
+ 'com.ibm.wala.cast.java.test',
+ 'com.ibm.wala.cast.java.test.data',
+ 'com.ibm.wala.cast.js',
+ 'com.ibm.wala.cast.js.html.nu_validator',
+ 'com.ibm.wala.cast.js.nodejs',
+ 'com.ibm.wala.cast.js.nodejs.test',
+ 'com.ibm.wala.cast.js.rhino',
+ 'com.ibm.wala.cast.js.rhino.test',
+ 'com.ibm.wala.cast.js.test',
+ 'com.ibm.wala.cast.js.test.data',
+ 'com.ibm.wala.cast.test',
+ 'com.ibm.wala.core',
+ 'com.ibm.wala.core.testdata',
+ 'com.ibm.wala.core.tests',
+ 'com.ibm.wala.dalvik',
+ 'com.ibm.wala.dalvik.test',
+ 'com.ibm.wala.ide',
+ 'com.ibm.wala.ide.jdt',
+ 'com.ibm.wala.ide.jdt.test',
+ 'com.ibm.wala.ide.jsdt',
+ 'com.ibm.wala.ide.jsdt.tests',
+ 'com.ibm.wala.ide.tests',
+ 'com.ibm.wala.ide_feature',
+ 'com.ibm.wala.scandroid',
+ 'com.ibm.wala.shrike',
+ 'com.ibm.wala.tests.ide_feature',
+ 'com.ibm.wala.tests_feature',
+ 'com.ibm.wala.util',
+ 'com.ibm.wala_feature',
+)