Skip to content

Commit

Permalink
Mass rename of subprojects
Browse files Browse the repository at this point in the history
The ubiquitous `com.ibm.wala.` prefix carries no useful information.
Let's remove this visual noise.
  • Loading branch information
liblit committed Feb 28, 2023
1 parent d7e05aa commit 9410362
Show file tree
Hide file tree
Showing 2,455 changed files with 190 additions and 203 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
**/.settings/org.eclipse.buildship.core.prefs
*.swp
*~
.classpath
.DS_Store
.project
/*/.classpath
/*/bin/
bin/
/.gradle/
/.vscode/settings.json
build/
2 changes: 1 addition & 1 deletion .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ import org.gradle.nativeplatform.tasks.LinkSharedLibrary
fun addCastLibrary(binary: CppBinary, linkTask: AbstractLinkTask, project: Project) {
linkTask.configure(
project.closureOf<AbstractLinkTask> {
project.project(":com.ibm.wala.cast:cast").tasks.named(
name, LinkSharedLibrary::class.java) {
addRpath(linkTask, nativeLibraryOutput)
}
project.project(":cast:cast").tasks.named(name, LinkSharedLibrary::class.java) {
addRpath(linkTask, nativeLibraryOutput)
}
addJvmLibrary(binary, linkTask, project)
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ repositories {
maven { url = uri("https://storage.googleapis.com/r8-releases/raw") }
}

the<BasePluginExtension>().archivesName.set("com.ibm.wala${project.path.replace(':', '.')}")

val sourceSets = the<SourceSetContainer>()

configurations {
Expand Down Expand Up @@ -125,7 +127,7 @@ tasks.named<Test>("test") {
}

if (project.hasProperty("excludeSlowTests")) {
dependencies { testImplementation(testFixtures(project(":com.ibm.wala.core"))) }
dependencies { testImplementation(testFixtures(project(":core"))) }
tasks.named<Test>("test") { useJUnit { excludeCategories("com.ibm.wala.tests.util.SlowTests") } }
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
18 changes: 8 additions & 10 deletions com.ibm.wala.cast/build.gradle.kts → cast/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,20 @@ val xlatorTestSharedLibrary: Configuration by
}

dependencies {
api(project(":com.ibm.wala.core")) {
api(projects.core) {
because("public method AstCGNode.addTarget receives an argument of type CGNode")
}
implementation(libs.commons.io)
implementation(project(":com.ibm.wala.shrike"))
implementation(project(":com.ibm.wala.util"))
implementation(projects.shrike)
implementation(projects.util)
castJsJavadocDestinationDirectory(
project(
mapOf(
"path" to ":com.ibm.wala.cast.js", "configuration" to "javadocDestinationDirectory")))
castCastSharedLibrary(project(":com.ibm.wala.cast:cast"))
project(mapOf("path" to ":cast:js", "configuration" to "javadocDestinationDirectory")))
castCastSharedLibrary(projects.cast.cast)
castJsPackageListDirectory(
project(mapOf("path" to ":com.ibm.wala.cast.js", "configuration" to "packageListDirectory")))
javadocClasspath(project(":com.ibm.wala.cast.js"))
project(mapOf("path" to ":cast:js", "configuration" to "packageListDirectory")))
javadocClasspath(projects.cast.js)
testImplementation(libs.junit)
testRuntimeOnly(testFixtures(project(":com.ibm.wala.core")))
testRuntimeOnly(testFixtures(projects.core))
xlatorTestSharedLibrary(project("xlator_test"))
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 16 additions & 0 deletions cast/java/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
plugins {
id("com.ibm.wala.gradle.java")
id("com.ibm.wala.gradle.publishing")
}

eclipse.project.natures("org.eclipse.pde.PluginNature")

dependencies {
implementation(projects.cast)
implementation(projects.core)
implementation(projects.shrike)
implementation(projects.util)
testFixturesImplementation(libs.junit)
testFixturesImplementation(projects.cast)
testFixturesImplementation(projects.core)
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,18 @@ val runSourceDirectory: Configuration by configurations.creating { isCanBeConsum

dependencies {
implementation(
project(":com.ibm.wala.cast"),
projects.cast,
)
implementation(project(":com.ibm.wala.cast.java"))
implementation(project(":com.ibm.wala.core"))
implementation(project(":com.ibm.wala.shrike"))
implementation(project(":com.ibm.wala.util"))
implementation(projects.cast.java)
implementation(projects.core)
implementation(projects.shrike)
implementation(projects.util)
runSourceDirectory(
project(
mapOf(
"path" to ":com.ibm.wala.cast.java.test.data",
"configuration" to "testJavaSourceDirectory")))
mapOf("path" to ":cast:java:test:data", "configuration" to "testJavaSourceDirectory")))
testImplementation(libs.junit)
testImplementation(testFixtures(project(":com.ibm.wala.cast.java")))
testRuntimeOnly(testFixtures(project(":com.ibm.wala.core")))
testImplementation(testFixtures(projects.cast.java))
testRuntimeOnly(testFixtures(projects.core))
}

application.mainClass.set("com.ibm.wala.cast.java.ecj.util.SourceDirCallGraph")
Expand All @@ -60,7 +58,7 @@ val run by
tasks.named<Test>("test") {
maxHeapSize = "1200M"

workingDir(project(":com.ibm.wala.cast.java.test.data").projectDir)
workingDir(project(":cast:java:test:data").projectDir)

// ensure the command-line driver for running ECJ works
dependsOn(run)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 9 additions & 11 deletions com.ibm.wala.cast.js/build.gradle.kts → cast/js/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,20 @@ plugins {
}

dependencies {
api(project(":com.ibm.wala.cast")) {
because("public class JSCallGraphUtil extends class CAstCallGraphUtil")
}
api(projects.cast) { because("public class JSCallGraphUtil extends class CAstCallGraphUtil") }
implementation(libs.commons.io)
implementation(libs.gson)
implementation(libs.jericho.html)
implementation(project(":com.ibm.wala.core"))
implementation(project(":com.ibm.wala.shrike"))
implementation(project(":com.ibm.wala.util"))
javadocClasspath(project(":com.ibm.wala.cast.js.rhino"))
implementation(projects.core)
implementation(projects.shrike)
implementation(projects.util)
javadocClasspath(projects.cast.js.rhino)
testFixturesImplementation(libs.junit)
testFixturesImplementation(testFixtures(project(":com.ibm.wala.cast")))
testFixturesImplementation(testFixtures(project(":com.ibm.wala.core")))
testFixturesImplementation(testFixtures(projects.cast))
testFixturesImplementation(testFixtures(projects.core))
testImplementation(libs.junit)
testImplementation(testFixtures(project(":com.ibm.wala.cast")))
testImplementation(testFixtures(project(":com.ibm.wala.core")))
testImplementation(testFixtures(projects.cast))
testImplementation(testFixtures(projects.core))
}

val createPackageList by
Expand Down
File renamed without changes.
18 changes: 18 additions & 0 deletions cast/js/html/nu_validator/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
plugins { id("com.ibm.wala.gradle.java") }

val extraTestResources: Configuration by configurations.creating { isCanBeConsumed = false }

dependencies {
extraTestResources(project(mapOf("path" to ":cast:js", "configuration" to "testResources")))
implementation(libs.htmlparser)
implementation(projects.cast)
implementation(projects.cast.js)
implementation(projects.util)
testImplementation(testFixtures(projects.cast))
testImplementation(testFixtures(projects.cast.js))
testImplementation(testFixtures(projects.cast.js.rhino))
}

tasks.named<Copy>("processTestResources") { from(extraTestResources) }

tasks.named<Test>("test") { maxHeapSize = "800M" }
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import java.net.URL
plugins { id("com.ibm.wala.gradle.java") }

dependencies {
api(project(":com.ibm.wala.cast.js")) {
api(projects.cast.js) {
because("public class NodejsCallGraphBuilderUtil extends class JSCallGraphUtil")
}
implementation(libs.commons.io)
implementation(libs.json)
implementation(project(":com.ibm.wala.cast"))
implementation(project(":com.ibm.wala.cast.js.rhino"))
implementation(project(":com.ibm.wala.core"))
implementation(project(":com.ibm.wala.util"))
implementation(projects.cast)
implementation(projects.cast.js.rhino)
implementation(projects.core)
implementation(projects.util)
testImplementation(libs.junit)
testRuntimeOnly(testFixtures(project(":com.ibm.wala.core")))
testRuntimeOnly(testFixtures(projects.core))
}

val downloadNodeJS by
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,20 @@ plugins {
val extraTestResources: Configuration by configurations.creating { isCanBeConsumed = false }

dependencies {
extraTestResources(
project(mapOf("path" to ":com.ibm.wala.cast.js", "configuration" to "testResources")))
extraTestResources(project(mapOf("path" to ":cast:js", "configuration" to "testResources")))
implementation(libs.rhino)
implementation(project(":com.ibm.wala.cast"))
implementation(project(":com.ibm.wala.cast.js"))
implementation(project(":com.ibm.wala.core"))
implementation(project(":com.ibm.wala.util"))
implementation(projects.cast)
implementation(projects.cast.js)
implementation(projects.core)
implementation(projects.util)
testImplementation(libs.gson)
testImplementation(libs.hamcrest)
testImplementation(libs.junit)
testImplementation(testFixtures(project(":com.ibm.wala.cast")))
testImplementation(testFixtures(project(":com.ibm.wala.cast.js")))
testImplementation(testFixtures(projects.cast))
testImplementation(testFixtures(projects.cast.js))
testFixturesImplementation(libs.junit)
testFixturesImplementation(testFixtures(project(":com.ibm.wala.cast")))
testFixturesImplementation(testFixtures(project(":com.ibm.wala.cast.js")))
testFixturesImplementation(testFixtures(projects.cast))
testFixturesImplementation(testFixtures(projects.cast.js))
}

tasks.named<Copy>("processTestResources") { from(extraTestResources) }
Expand Down
File renamed without changes.
Loading

0 comments on commit 9410362

Please sign in to comment.