From aae1c2230ac817bec5c5c595d038b04a63bc489e Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Thu, 21 Dec 2017 09:31:18 -0600 Subject: [PATCH] Consistently use simple sorted order for dependencies This isn't even sorting by library or subproject name. It's just a dumb textual sort of the contents of each line. --- com.ibm.wala.cast.java.ecj/build.gradle | 4 ++-- com.ibm.wala.cast.java/build.gradle | 2 -- .../build.gradle | 7 +++---- com.ibm.wala.cast.js.nodejs/build.gradle | 4 ++-- com.ibm.wala.cast.js.rhino/build.gradle | 8 ++++---- com.ibm.wala.cast.js/build.gradle | 9 ++++----- com.ibm.wala.cast/build.gradle | 6 +++--- com.ibm.wala.core/build.gradle | 2 +- com.ibm.wala.dalvik/build.gradle | 10 +++++----- com.ibm.wala.ide.jdt/build.gradle | 14 +++++++------- com.ibm.wala.ide.jsdt/build.gradle | 12 ++++++------ com.ibm.wala.ide/build.gradle | 4 ++-- com.ibm.wala.scandroid/build.gradle | 4 ++-- 13 files changed, 41 insertions(+), 45 deletions(-) diff --git a/com.ibm.wala.cast.java.ecj/build.gradle b/com.ibm.wala.cast.java.ecj/build.gradle index 7c87e9d13..58e35d020 100644 --- a/com.ibm.wala.cast.java.ecj/build.gradle +++ b/com.ibm.wala.cast.java.ecj/build.gradle @@ -1,11 +1,11 @@ sourceSets.main.java.srcDir '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' - compile 'org.eclipse.platform:org.eclipse.equinox.common:3.9.0' } diff --git a/com.ibm.wala.cast.java/build.gradle b/com.ibm.wala.cast.java/build.gradle index 2fe293ecc..0c79f5f01 100644 --- a/com.ibm.wala.cast.java/build.gradle +++ b/com.ibm.wala.cast.java/build.gradle @@ -5,6 +5,4 @@ dependencies { compile project(':com.ibm.wala.core') compile project(':com.ibm.wala.shrike') compile project(':com.ibm.wala.util') - // 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/build.gradle b/com.ibm.wala.cast.js.html.nu_validator/build.gradle index eccac5f9b..e9ff0fd64 100644 --- a/com.ibm.wala.cast.js.html.nu_validator/build.gradle +++ b/com.ibm.wala.cast.js.html.nu_validator/build.gradle @@ -4,13 +4,12 @@ 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') - compile 'nu.validator.htmlparser:htmlparser:1.4' - - testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.cast.js.rhino.test') - testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.cast.js.test') 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') } diff --git a/com.ibm.wala.cast.js.nodejs/build.gradle b/com.ibm.wala.cast.js.nodejs/build.gradle index d44b9aa72..b0ef4226a 100644 --- a/com.ibm.wala.cast.js.nodejs/build.gradle +++ b/com.ibm.wala.cast.js.nodejs/build.gradle @@ -4,11 +4,11 @@ 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' - compile 'org.json:json:20160212' } diff --git a/com.ibm.wala.cast.js.rhino/build.gradle b/com.ibm.wala.cast.js.rhino/build.gradle index c3b1750b9..9583f471b 100644 --- a/com.ibm.wala.cast.js.rhino/build.gradle +++ b/com.ibm.wala.cast.js.rhino/build.gradle @@ -1,9 +1,9 @@ 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') 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') } diff --git a/com.ibm.wala.cast.js/build.gradle b/com.ibm.wala.cast.js/build.gradle index 78621ffea..1db2f4a0f 100644 --- a/com.ibm.wala.cast.js/build.gradle +++ b/com.ibm.wala.cast.js/build.gradle @@ -4,11 +4,10 @@ sourceSets.main { } 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.shrike') - compile project(':com.ibm.wala.util') 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') } diff --git a/com.ibm.wala.cast/build.gradle b/com.ibm.wala.cast/build.gradle index 16bf31bad..447957042 100644 --- a/com.ibm.wala.cast/build.gradle +++ b/com.ibm.wala.cast/build.gradle @@ -1,8 +1,8 @@ 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 'commons-io:commons-io:2.4' + compile project(':com.ibm.wala.core') + compile project(':com.ibm.wala.shrike') + compile project(':com.ibm.wala.util') } diff --git a/com.ibm.wala.core/build.gradle b/com.ibm.wala.core/build.gradle index 1c8c1ded6..d348881c8 100644 --- a/com.ibm.wala.core/build.gradle +++ b/com.ibm.wala.core/build.gradle @@ -7,6 +7,6 @@ sourceSets.main { } dependencies { - compile project(':com.ibm.wala.util') compile project(':com.ibm.wala.shrike') + compile project(':com.ibm.wala.util') } diff --git a/com.ibm.wala.dalvik/build.gradle b/com.ibm.wala.dalvik/build.gradle index e2a05766f..f8e1280e3 100644 --- a/com.ibm.wala.dalvik/build.gradle +++ b/com.ibm.wala.dalvik/build.gradle @@ -1,10 +1,10 @@ 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 'org.smali:dexlib2:2.2.1' 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') } diff --git a/com.ibm.wala.ide.jdt/build.gradle b/com.ibm.wala.ide.jdt/build.gradle index 46a35a13c..90a64fb79 100644 --- a/com.ibm.wala.ide.jdt/build.gradle +++ b/com.ibm.wala.ide.jdt/build.gradle @@ -1,12 +1,6 @@ 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' @@ -14,7 +8,13 @@ dependencies { 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 'org.eclipse.platform:org.eclipse.osgi:3.12.50' + 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') } diff --git a/com.ibm.wala.ide.jsdt/build.gradle b/com.ibm.wala.ide.jsdt/build.gradle index 87a72a62a..e7d993190 100644 --- a/com.ibm.wala.ide.jsdt/build.gradle +++ b/com.ibm.wala.ide.jsdt/build.gradle @@ -1,12 +1,6 @@ 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' @@ -16,4 +10,10 @@ dependencies { compile 'org.eclipse.wst.jsdt:core:1.0.201.v2010012803' compile 'org.eclipse.wst.jsdt:ui:1.0.201.v2010012803' compile 'org.osgi:org.osgi.core:4.2.0' + 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') } diff --git a/com.ibm.wala.ide/build.gradle b/com.ibm.wala.ide/build.gradle index a7cc51019..198cdf09e 100644 --- a/com.ibm.wala.ide/build.gradle +++ b/com.ibm.wala.ide/build.gradle @@ -1,8 +1,6 @@ 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' @@ -12,4 +10,6 @@ dependencies { 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') } diff --git a/com.ibm.wala.scandroid/build.gradle b/com.ibm.wala.scandroid/build.gradle index afc418287..44cbef9b0 100644 --- a/com.ibm.wala.scandroid/build.gradle +++ b/com.ibm.wala.scandroid/build.gradle @@ -1,10 +1,10 @@ sourceSets.main.java.srcDir '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' - compile 'commons-cli:commons-cli:1.4' }