Clean up some simple syntactic redundancy in dependency declarations

This commit is contained in:
Ben Liblit 2018-01-10 21:56:27 -06:00
parent 9084cb9ad3
commit 1432e18c37
23 changed files with 234 additions and 186 deletions

View File

@ -1,11 +1,13 @@
sourceSets.main.java.srcDirs = ['src']
dependencies {
compile 'org.eclipse.jdt:org.eclipse.jdt.core:3.13.50'
compile 'org.eclipse.platform:org.eclipse.equinox.common:3.9.0'
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',
'org.eclipse.platform:org.eclipse.equinox.common:3.9.0',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.cast.java'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
)
}

View File

@ -5,13 +5,15 @@ plugins {
sourceSets.test.java.srcDirs = ['src']
dependencies {
testCompile 'junit:junit:4.11'
testCompile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'
testCompile 'org.osgi:org.osgi.core:4.2.0'
testCompile project(':com.ibm.wala.cast')
testCompile project(':com.ibm.wala.cast.java')
testCompile project(':com.ibm.wala.core')
testCompile project(':com.ibm.wala.shrike')
testCompile project(':com.ibm.wala.util')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests')
testCompile(
'junit:junit:4.11',
'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214',
'org.osgi:org.osgi.core:4.2.0',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.cast.java'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
)
}

View File

@ -1,8 +1,10 @@
sourceSets.main.java.srcDirs = ['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')
compile(
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
)
}

View File

@ -7,12 +7,16 @@ sourceSets {
}
dependencies {
compile 'nu.validator.htmlparser:htmlparser:1.4'
compile project(':com.ibm.wala.cast')
compile project(':com.ibm.wala.cast.js')
compile project(':com.ibm.wala.util')
testCompile project(':com.ibm.wala.cast.test')
testCompile project(':com.ibm.wala.core.tests')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.cast.js.rhino.test')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.cast.js.test')
compile(
'nu.validator.htmlparser:htmlparser:1.4',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.cast.js'),
project(':com.ibm.wala.util'),
)
testCompile(
project(':com.ibm.wala.cast.test'),
project(':com.ibm.wala.core.tests'),
project(configuration: 'testArchives', path: ':com.ibm.wala.cast.js.rhino.test'),
project(configuration: 'testArchives', path: ':com.ibm.wala.cast.js.test'),
)
}

View File

@ -4,7 +4,9 @@ sourceSets.test {
}
dependencies {
testCompile 'junit:junit:4.11'
testCompile project(':com.ibm.wala.cast.js.nodejs')
testCompile project(':com.ibm.wala.core')
testCompile(
'junit:junit:4.11',
project(':com.ibm.wala.cast.js.nodejs'),
project(':com.ibm.wala.core'),
)
}

View File

@ -4,11 +4,13 @@ sourceSets.main {
}
dependencies {
compile 'commons-io:commons-io:2.4'
compile 'org.json:json:20160212'
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',
'org.json:json:20160212',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.cast.js'),
project(':com.ibm.wala.cast.js.rhino'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.util'),
)
}

View File

@ -8,16 +8,18 @@ sourceSets.test {
}
dependencies {
testCompile 'junit:junit:4.11'
testCompile project(':com.ibm.wala.cast')
testCompile project(':com.ibm.wala.cast.js')
testCompile project(':com.ibm.wala.cast.js.rhino')
testCompile project(':com.ibm.wala.core')
testCompile project(':com.ibm.wala.shrike')
testCompile project(':com.ibm.wala.util')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.cast.js.test')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.cast.test')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests')
testCompile(
'junit:junit:4.11',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.cast.js'),
project(':com.ibm.wala.cast.js.rhino'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
project(configuration: 'testArchives', path: ':com.ibm.wala.cast.js.test'),
project(configuration: 'testArchives', path: ':com.ibm.wala.cast.test'),
project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
)
}
test.environment 'TRAVIS', 1

View File

@ -1,9 +1,11 @@
sourceSets.main.java.srcDirs = ['source']
dependencies {
compile 'org.mozilla:rhino:1.7.7.1'
compile project(':com.ibm.wala.cast')
compile project(':com.ibm.wala.cast.js')
compile project(':com.ibm.wala.core')
compile project(':com.ibm.wala.util')
compile(
'org.mozilla:rhino:1.7.7.1',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.cast.js'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.util'),
)
}

View File

@ -5,15 +5,17 @@ plugins {
sourceSets.test.java.srcDirs = ['harness-src']
dependencies {
testCompile 'junit:junit:4.11'
testCompile project(':com.ibm.wala.cast')
testCompile project(':com.ibm.wala.cast.js')
testCompile project(':com.ibm.wala.cast.js.rhino')
testCompile project(':com.ibm.wala.core')
testCompile project(':com.ibm.wala.shrike')
testCompile project(':com.ibm.wala.util')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.cast.test')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests')
testCompile(
'junit:junit:4.11',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.cast.js'),
project(':com.ibm.wala.cast.js.rhino'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
project(configuration: 'testArchives', path: ':com.ibm.wala.cast.test'),
project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
)
}
processTestResources {

View File

@ -4,10 +4,12 @@ sourceSets.main {
}
dependencies {
compile 'commons-io:commons-io:2.4'
compile 'net.htmlparser.jericho:jericho-html:3.2'
compile project(':com.ibm.wala.cast')
compile project(':com.ibm.wala.core')
compile project(':com.ibm.wala.shrike')
compile project(':com.ibm.wala.util')
compile(
'commons-io:commons-io:2.4',
'net.htmlparser.jericho:jericho-html:3.2',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
)
}

View File

@ -7,11 +7,13 @@ apply plugin: 'cpp'
sourceSets.test.java.srcDirs = ['harness-src/java']
dependencies {
testCompile 'junit:junit:4.11'
testCompile project(':com.ibm.wala.cast')
testCompile project(':com.ibm.wala.core')
testCompile project(':com.ibm.wala.util')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests')
testCompile(
'junit:junit:4.11',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.util'),
project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
)
}
// TODO: build following targets for "test"-only, not "main"

View File

@ -3,10 +3,12 @@ apply plugin: 'cpp'
sourceSets.main.java.srcDirs = ['source/java']
dependencies {
compile 'commons-io:commons-io:2.4'
compile project(':com.ibm.wala.core')
compile project(':com.ibm.wala.shrike')
compile project(':com.ibm.wala.util')
compile(
'commons-io:commons-io:2.4',
project(':com.ibm.wala.core'),
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
)
}
tasks.javadoc {

View File

@ -8,12 +8,14 @@ sourceSets.test {
}
dependencies {
testCompile 'junit:junit:4.11'
testCompile 'org.apache.ant:ant:1.8.2'
testCompile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'
testCompile 'org.hamcrest:hamcrest-core:1.3'
testCompile 'org.osgi:org.osgi.core:4.2.0'
testCompile project(':com.ibm.wala.core')
testCompile project(':com.ibm.wala.shrike')
testCompile project(':com.ibm.wala.util')
testCompile(
'junit:junit:4.11',
'org.apache.ant:ant:1.8.2',
'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214',
'org.hamcrest:hamcrest-core:1.3',
'org.osgi:org.osgi.core:4.2.0',
project(':com.ibm.wala.core'),
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
)
}

View File

@ -7,8 +7,10 @@ sourceSets.main {
}
dependencies {
compile project(':com.ibm.wala.shrike')
compile project(':com.ibm.wala.util')
compile(
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
)
}
tasks.javadoc {

View File

@ -7,12 +7,14 @@ sourceSets.test {
}
dependencies {
testCompile 'com.google.android.tools:dx:1.7'
testCompile 'junit:junit:4.11'
testCompile 'org.osgi:org.osgi.core:4.2.0'
testCompile project(':com.ibm.wala.core')
testCompile project(':com.ibm.wala.dalvik')
testCompile project(':com.ibm.wala.shrike')
testCompile project(':com.ibm.wala.util')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests')
testCompile(
'com.google.android.tools:dx:1.7',
'junit:junit:4.11',
'org.osgi:org.osgi.core:4.2.0',
project(':com.ibm.wala.core'),
project(':com.ibm.wala.dalvik'),
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
)
}

View File

@ -1,10 +1,12 @@
sourceSets.main.java.srcDirs = ['src']
dependencies {
compile 'org.slf4j:slf4j-api:1.7.2'
compile 'org.smali:dexlib2:2.2.1'
compile project(':com.ibm.wala.cast')
compile project(':com.ibm.wala.core')
compile project(':com.ibm.wala.shrike')
compile project(':com.ibm.wala.util')
compile(
'org.slf4j:slf4j-api:1.7.2',
'org.smali:dexlib2:2.2.1',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
)
}

View File

@ -7,20 +7,22 @@ sourceSets.test {
}
dependencies {
testCompile 'junit:junit:4.11'
testCompile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'
testCompile 'org.eclipse.jdt:org.eclipse.jdt.core:3.13.50'
testCompile 'org.eclipse.platform:org.eclipse.core.runtime:3.13.0'
testCompile project(':com.ibm.wala.cast')
testCompile project(':com.ibm.wala.cast.java')
testCompile project(':com.ibm.wala.cast.java.ecj')
testCompile project(':com.ibm.wala.core')
testCompile project(':com.ibm.wala.ide')
testCompile project(':com.ibm.wala.ide.jdt')
testCompile project(':com.ibm.wala.shrike')
testCompile project(':com.ibm.wala.util')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.cast.java.test')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.ide.tests')
testCompile(
'junit:junit:4.11',
'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214',
'org.eclipse.jdt:org.eclipse.jdt.core:3.13.50',
'org.eclipse.platform:org.eclipse.core.runtime:3.13.0',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.cast.java'),
project(':com.ibm.wala.cast.java.ecj'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.ide'),
project(':com.ibm.wala.ide.jdt'),
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
project(configuration: 'testArchives', path: ':com.ibm.wala.cast.java.test'),
project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
project(configuration: 'testArchives', path: ':com.ibm.wala.ide.tests'),
)
testRuntime 'org.eclipse.platform:org.eclipse.osgi:3.12.50'
}

View File

@ -1,20 +1,22 @@
sourceSets.main.java.srcDirs = ['source']
dependencies {
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.core.runtime:3.13.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'
compile 'org.osgi:org.osgi.core:4.2.0'
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',
'org.eclipse.platform:org.eclipse.core.jobs:3.9.1',
'org.eclipse.platform:org.eclipse.core.resources:3.12.0',
'org.eclipse.platform:org.eclipse.core.runtime:3.13.0',
'org.eclipse.platform:org.eclipse.equinox.app:1.3.400',
'org.eclipse.platform:org.eclipse.equinox.common:3.9.0',
'org.eclipse.platform:org.eclipse.jface:3.13.1',
'org.eclipse.platform:org.eclipse.osgi:3.12.50',
'org.eclipse.platform:org.eclipse.ui.workbench:3.110.1',
'org.osgi:org.osgi.core:4.2.0',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.cast.java'),
project(':com.ibm.wala.cast.java.ecj'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.ide'),
project(':com.ibm.wala.util'),
)
}

View File

@ -1,17 +1,19 @@
sourceSets.test.java.srcDirs = ['src']
dependencies {
testCompile 'junit:junit:4.11'
testCompile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'
testCompile 'org.eclipse.platform:org.eclipse.core.runtime:3.13.0'
testCompile 'org.eclipse.platform:org.eclipse.equinox.common:3.9.0'
testCompile 'org.eclipse.wst.jsdt:core:1.0.201.v2010012803'
testCompile project(':com.ibm.wala.cast')
testCompile project(':com.ibm.wala.cast.js')
testCompile project(':com.ibm.wala.cast.js.rhino')
testCompile project(':com.ibm.wala.core')
testCompile project(':com.ibm.wala.ide.jsdt')
testCompile project(':com.ibm.wala.util')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.ide.tests')
testCompile(
'junit:junit:4.11',
'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214',
'org.eclipse.platform:org.eclipse.core.runtime:3.13.0',
'org.eclipse.platform:org.eclipse.equinox.common:3.9.0',
'org.eclipse.wst.jsdt:core:1.0.201.v2010012803',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.cast.js'),
project(':com.ibm.wala.cast.js.rhino'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.ide.jsdt'),
project(':com.ibm.wala.util'),
project(configuration: 'testArchives', path: ':com.ibm.wala.ide.tests'),
)
testRuntime 'org.eclipse.platform:org.eclipse.osgi:3.12.50'
}

View File

@ -1,16 +1,18 @@
sourceSets.main.java.srcDirs = ['source']
dependencies {
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'
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',
'org.eclipse.platform:org.eclipse.core.resources:3.12.0',
'org.eclipse.platform:org.eclipse.core.runtime:3.13.0',
'org.eclipse.platform:org.eclipse.equinox.common:3.9.0',
'org.eclipse.wst.jsdt:core:1.0.201.v2010012803',
'org.eclipse.wst.jsdt:ui:1.0.201.v2010012803',
project(':com.ibm.wala.cast'),
project(':com.ibm.wala.cast.js'),
project(':com.ibm.wala.cast.js.rhino'),
project(':com.ibm.wala.core'),
project(':com.ibm.wala.ide'),
project(':com.ibm.wala.util'),
)
}

View File

@ -5,18 +5,20 @@ plugins {
sourceSets.test.java.srcDirs = ['src']
dependencies {
testCompile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'
testCompile 'org.eclipse.platform:org.eclipse.core.resources:3.12.0'
testCompile 'org.eclipse.platform:org.eclipse.core.runtime:3.13.0'
testCompile 'org.eclipse.platform:org.eclipse.equinox.common:3.9.0'
testCompile 'org.eclipse.platform:org.eclipse.jface:3.13.1'
testCompile 'org.eclipse.platform:org.eclipse.osgi:3.12.50'
testCompile 'org.eclipse.platform:org.eclipse.ui.ide:3.13.1'
testCompile 'org.eclipse.platform:org.eclipse.ui.workbench:3.110.1'
testCompile 'org.osgi:org.osgi.core:4.2.0'
testCompile project(':com.ibm.wala.core')
testCompile project(':com.ibm.wala.ide')
testCompile project(':com.ibm.wala.util')
testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests')
testCompile(
'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214',
'org.eclipse.platform:org.eclipse.core.resources:3.12.0',
'org.eclipse.platform:org.eclipse.core.runtime:3.13.0',
'org.eclipse.platform:org.eclipse.equinox.common:3.9.0',
'org.eclipse.platform:org.eclipse.jface:3.13.1',
'org.eclipse.platform:org.eclipse.osgi:3.12.50',
'org.eclipse.platform:org.eclipse.ui.ide:3.13.1',
'org.eclipse.platform:org.eclipse.ui.workbench:3.110.1',
'org.osgi:org.osgi.core:4.2.0',
project(':com.ibm.wala.core'),
project(':com.ibm.wala.ide'),
project(':com.ibm.wala.util'),
project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
)
testRuntime project(':com.ibm.wala.ide.jdt')
}

View File

@ -1,15 +1,17 @@
sourceSets.main.java.srcDirs = ['src']
dependencies {
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'
compile project(':com.ibm.wala.core')
compile project(':com.ibm.wala.util')
compile(
'org.eclipse.pde:org.eclipse.pde.core:3.11.1',
'org.eclipse.platform:org.eclipse.core.commands:3.9.0',
'org.eclipse.platform:org.eclipse.core.resources:3.12.0',
'org.eclipse.platform:org.eclipse.core.runtime:3.13.0',
'org.eclipse.platform:org.eclipse.equinox.common:3.9.0',
'org.eclipse.platform:org.eclipse.jface:3.13.1',
'org.eclipse.platform:org.eclipse.osgi:3.12.50',
'org.eclipse.platform:org.eclipse.swt.${osgi.platform}:3.106.1',
'org.eclipse.platform:org.eclipse.ui.workbench:3.110.1',
project(':com.ibm.wala.core'),
project(':com.ibm.wala.util'),
)
}

View File

@ -1,10 +1,12 @@
sourceSets.main.java.srcDirs = ['source']
dependencies {
compile 'com.google.guava:guava:18.0'
compile 'commons-cli:commons-cli:1.4'
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',
'commons-cli:commons-cli:1.4',
project(':com.ibm.wala.core'),
project(':com.ibm.wala.dalvik'),
project(':com.ibm.wala.shrike'),
project(':com.ibm.wala.util'),
)
}