Skip to content

Commit

Permalink
did more cleanup of build files
Browse files Browse the repository at this point in the history
did more dependency cleanup

finished cleaning up the source dependencies

went through all the jar dependencies
  • Loading branch information
rjgriffin42 committed Aug 12, 2024
1 parent 12ace31 commit 101aa24
Show file tree
Hide file tree
Showing 30 changed files with 8 additions and 536 deletions.
17 changes: 0 additions & 17 deletions atlas/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,37 +14,20 @@ ihmc {
}

mainDependencies {
api("org.ddogleg:ddogleg:0.18")
api("org.apache.xmlgraphics:batik-dom:1.14")
api("org.apache.ant:ant:1.9.0")
api("com.martiansoftware:jsap:2.1")
api("org.boofcv:boofcv-calibration:0.36")
api("org.boofcv:boofcv-swing:0.36")
api("com.github.wendykierp:JTransforms:3.1")

api("us.ihmc:euclid-frame-shape:0.21.0")
api("us.ihmc:ihmc-javafx-toolkit:17-0.22.9")
api("us.ihmc:ihmc-humanoid-behaviors:source")
api("us.ihmc:ihmc-avatar-interfaces-visualizers:source")
api("us.ihmc:robotiq-hand-drivers:source")
api("us.ihmc:ihmc-model-file-loader:source")
api("us.ihmc:ihmc-robot-data-visualizer:source")
api("us.ihmc:ihmc-manipulation-planning:source")
api("us.ihmc:ihmc-parameter-tuner:source")
api("us.ihmc:ihmc-footstep-planning-visualizers:source")
api("us.ihmc:ihmc-high-level-behaviors:source")
}

testDependencies {
api("com.thoughtworks.xstream:xstream:1.4.19")

api("us.ihmc:ihmc-commons-testing:0.32.0")
api("us.ihmc:ihmc-robotics-toolkit-test:source")
api("us.ihmc:ihmc-common-walking-control-modules-test:source")
api("us.ihmc:ihmc-avatar-interfaces-test:source")
api("us.ihmc:ihmc-humanoid-robotics-test:source")
api("us.ihmc:ihmc-sensor-processing-test:source")
api("us.ihmc:ihmc-simulation-toolkit-test:source")
api("us.ihmc:simulation-construction-set-tools-test:source")
api("us.ihmc:ihmc-messager-test:0.2.0")
}
86 changes: 0 additions & 86 deletions atlas/src/main/java/us/ihmc/atlas/AtlasHeadPoseEstimator.java

This file was deleted.

2 changes: 0 additions & 2 deletions example-simulations/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ ihmc {
}

mainDependencies {
api("us.ihmc:ihmc-model-file-loader:source")
api("us.ihmc:ihmc-quadruped-robotics:source")
}

testDependencies {
api("us.ihmc:ihmc-commons-testing:0.32.0")
api("us.ihmc:ihmc-robotics-toolkit-test:source")
api("us.ihmc:ihmc-quadruped-robotics-test:source")
api("us.ihmc:ihmc-quadruped-planning-test:source")
Expand Down
34 changes: 3 additions & 31 deletions ihmc-avatar-interfaces/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,16 @@ ihmc {
mainDependencies {
api("com.martiansoftware:jsap:2.1")
api("org.apache.poi:poi:3.15") // I/O library for xls files.
api("org.ejml:ejml-core:0.39")
api("org.ejml:ejml-ddense:0.39")
api("org.boofcv:boofcv-geo:0.36")
api("org.jfree:jfreechart:1.0.19")
api("com.github.quickhull3d:quickhull3d:1.0.0")
api("com.github.wendykierp:JTransforms:3.1")
api("org.reflections:reflections:0.9.10")
api("com.hierynomus:sshj:0.32.0")

api("us.ihmc:euclid:0.21.0")
api("us.ihmc:euclid-geometry:0.21.0")
api("us.ihmc:mecano-graphviz:17-0.18.1")
api("us.ihmc:robot-environment-awareness:source")
api("us.ihmc:robot-environment-awareness-visualizers:source")
api("us.ihmc:ihmc-ros-tools:source")
api("us.ihmc:ihmc-common-walking-control-modules:source")
api("us.ihmc:ihmc-model-file-loader:source")
api("us.ihmc:ihmc-sensor-processing:source")
api("us.ihmc:ihmc-communication:source")
api("us.ihmc:scs2-bullet-simulation:17-0.26.0")

api("us.ihmc:ihmc-humanoid-behaviors:source")
api("us.ihmc:ihmc-humanoid-robotics:source")
api("us.ihmc:ihmc-perception:source")
api("us.ihmc:ihmc-whole-body-controller:source")
api("us.ihmc:ihmc-state-estimation:source")
api("us.ihmc:ihmc-java-toolkit:source")
api("us.ihmc:ihmc-robotics-toolkit:source")
api("us.ihmc:ihmc-robot-models:source")
api("us.ihmc:ihmc-graphics-javafx:source")
api("us.ihmc:ihmc-graphics-jmonkeyengine:source")
api("us.ihmc:ihmc-simulation-toolkit:source")
api("us.ihmc:ihmc-robot-data-visualizer:source")
api("us.ihmc:ihmc-footstep-planning:source")
api("us.ihmc:simulation-construction-set-tools:source")
api("us.ihmc:scs2-definition:17-0.26.0")
api("us.ihmc:scs2-bullet-simulation:17-0.26.0")
api("us.ihmc:scs2-session-visualizer-jfx:17-0.26.0")
api("us.ihmc:scs2-simulation-construction-set:17-0.26.0")
api("us.ihmc:robot-environment-awareness-visualizers:source")
}

testDependencies {
Expand All @@ -68,7 +41,6 @@ testDependencies {
visualizersDependencies {
api(ihmc.sourceSetProject("main"))

api("us.ihmc:ihmc-javafx-toolkit:17-0.22.9")
api("us.ihmc:robot-environment-awareness-application:source")
api("us.ihmc:ihmc-path-planning-visualizers:source")
api("us.ihmc:ihmc-footstep-planning-visualizers:source")
Expand Down
17 changes: 0 additions & 17 deletions ihmc-common-walking-control-modules/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,14 @@ ihmc {
}

mainDependencies {
api("gov.nist.math:jama:1.0.3")
api("com.google.guava:guava:18.0")
api("org.ejml:ejml-ddense:0.39")
api("org.ejml:ejml-core:0.39")
api("net.sf.trove4j:trove4j:3.0.3")

api("us.ihmc:ihmc-realtime:1.6.0")
api("us.ihmc:ihmc-native-library-loader:2.0.3")
api("us.ihmc:euclid:0.21.0")
api("us.ihmc:euclid-geometry:0.21.0")
api("us.ihmc:ihmc-robot-models:source")
api("us.ihmc:ihmc-sensor-processing:source")
api("us.ihmc:ihmc-trajectory-optimization:source")
api("us.ihmc:ihmc-communication:source")
api("us.ihmc:ihmc-convex-optimization:0.17.19")
api("us.ihmc:ihmc-robotics-toolkit:source")
api("us.ihmc:ihmc-java-toolkit:source")
// api("us.ihmc:ihmc-footstep-planning:source")
api("us.ihmc:ihmc-humanoid-robotics:source")
api("us.ihmc:ihmc-parameter-estimation:source")
}

testDependencies {
api(ihmc.sourceSetProject("visualizers"))
api("us.ihmc:ihmc-commons-testing:0.32.0")
api("us.ihmc:simulation-construction-set-tools-test:source")
api("us.ihmc:ihmc-robotics-toolkit-test:source")
api("us.ihmc:ihmc-robotics-toolkit-test:source")
Expand Down
13 changes: 0 additions & 13 deletions ihmc-footstep-planning/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,22 @@ ihmc {
}

mainDependencies {
api("us.ihmc:ihmc-convex-optimization:0.17.19")
api("us.ihmc:ihmc-path-planning:source")
api("us.ihmc:ihmc-perception:source")
api("us.ihmc:ihmc-common-walking-control-modules:source")
api("us.ihmc:ihmc-path-planning-data-sets:source")
api("us.ihmc:ihmc-pub-sub-serializers-extra:0.19.1")
}

testDependencies {
api(ihmc.sourceSetProject("visualizers"))

api("us.ihmc:ihmc-path-planning-data-sets:source")
api("us.ihmc:ihmc-robotics-toolkit:source")
api("us.ihmc:ihmc-path-planning-test:source")
api("us.ihmc:simulation-construction-set-tools-test:source")
}

visualizersDependencies {
api(ihmc.sourceSetProject("main"))

api("us.ihmc:ihmc-messager-javafx:0.2.0")
api("us.ihmc:ihmc-javafx-toolkit:17-0.22.9")
api("us.ihmc:robot-environment-awareness-application:source")
api("us.ihmc:ihmc-communication:source")
api("us.ihmc:ihmc-path-planning-visualizers:source")
api("us.ihmc:ihmc-robot-models:source")
api("us.ihmc:ihmc-graphics-javafx:source")
api("us.ihmc:ihmc-graphics-jmonkeyengine:source")
api("us.ihmc:ihmc-whole-body-controller:source")
api("us.ihmc:ihmc-common-walking-control-modules-test:source")

}
1 change: 0 additions & 1 deletion ihmc-graphics/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ ihmc {

mainDependencies {
api("us.ihmc:ihmc-sensor-processing:source")
api("us.ihmc:ihmc-graphics-description:0.25.1")
}

testDependencies {
Expand Down
17 changes: 1 addition & 16 deletions ihmc-high-level-behaviors/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ mainDependencies {
}

missionControlDependencies {
api("us.ihmc:ihmc-commons:0.32.0")
api("us.ihmc:log-tools:0.6.3")
api("us.ihmc:ihmc-ros2-library:0.24.2")
api("us.ihmc:ihmc-java-toolkit:source")
api("us.ihmc:ihmc-robotics-toolkit:source")
api("us.ihmc:ihmc-interfaces:source")
api("us.ihmc:ihmc-communication:source")
}

Expand All @@ -37,9 +31,6 @@ libgdxDependencies {
api(ihmc.sourceSetProject("mission-control"))
api("org.abego.treelayout:org.abego.treelayout.core:1.0.3")
api("us.ihmc:ihmc-graphics-libgdx:source")
api("us.ihmc:ihmc-graphics-libgdx:source")
api("us.ihmc:scs2-definition:17-0.26.0")
api("us.ihmc:mecano-graphviz:17-0.18.1")
api("com.badlogicgames.gdx-controllers:gdx-controllers-core:2.2.3")
api("com.badlogicgames.gdx-controllers:gdx-controllers-desktop:2.2.3")
api("commons-io:commons-io:2.11.0") // IOUtils method was old version without this
Expand All @@ -53,12 +44,6 @@ testDependencies {
api("us.ihmc:scs2-examples:17-0.26.0")
api("us.ihmc:scs2-bullet-simulation-test:17-0.26.0")
api("us.ihmc:example-simulations:source")

api("us.ihmc:ihmc-avatar-interfaces:source") {
exclude(group = "org.openjfx")
exclude(group = "org.jmonkeyengine")
exclude(group = "org.lwjgl.lwjgl") // exclude lwjgl 2
}
}

app.entrypoint(ihmc.sourceSetProject("mission-control"),
Expand Down Expand Up @@ -86,7 +71,7 @@ tasks.create("deploy") {
// Delete mission-control-2 if it's still around
exec("sudo systemctl stop mission-control-2")
exec("sudo systemctl disable mission-control-2")
exec("sudo rm -rf /etc/systemd/system/mission-control-2.service");
exec("sudo rm -rf /etc/systemd/system/mission-control-2.service")

exec("sudo systemctl stop mission-control-3")

Expand Down
12 changes: 0 additions & 12 deletions ihmc-humanoid-behaviors/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,9 @@ ihmc {
}

mainDependencies {
api("com.thoughtworks.xstream:xstream:1.4.19")
api("org.georegression:georegression:0.22")
api("org.boofcv:boofcv-geo:0.36")
api("org.boofcv:boofcv-ip:0.36")
api("org.boofcv:boofcv-io:0.36")
api("org.boofcv:boofcv-recognition:0.36")
api("org.postgresql:postgresql:42.2.5")

api("us.ihmc:simulation-construction-set:0.25.1")
api("us.ihmc:ihmc-manipulation-planning:source")
api("us.ihmc:ihmc-communication:source")
api("us.ihmc:ihmc-humanoid-robotics:source")
api("us.ihmc:ihmc-robot-data-logger:0.29.1")
api("us.ihmc:ihmc-whole-body-controller:source")
api("us.ihmc:ihmc-perception:source")
api("us.ihmc:ihmc-footstep-planning:source")
}

Expand Down
1 change: 0 additions & 1 deletion ihmc-interfaces/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ ihmc {
}

mainDependencies {
api("us.ihmc:euclid:0.21.0")
api("us.ihmc:euclid-geometry:0.21.0")
api("us.ihmc:ihmc-pub-sub:0.19.1")
api("us.ihmc:ros2-common-interfaces:0.24.2") {
Expand Down
2 changes: 0 additions & 2 deletions ihmc-java-toolkit/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ mainDependencies {

api("us.ihmc:ihmc-commons:0.32.0")
api("us.ihmc:log-tools:0.6.3")
api("us.ihmc:euclid:0.21.0")
api("us.ihmc:euclid-frame:0.21.0")
api("us.ihmc:euclid-shape:0.21.0")
api("us.ihmc:euclid-geometry:0.21.0")
api("us.ihmc:ihmc-graphics-description:0.25.1")
Expand Down
6 changes: 0 additions & 6 deletions ihmc-manipulation-planning/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,8 @@ ihmc {
}

mainDependencies {
api("javax.vecmath:vecmath:1.5.2")
api("org.georegression:georegression:0.22")

api("us.ihmc:simulation-construction-set:0.25.1")
api("us.ihmc:ihmc-communication:source")
api("us.ihmc:ihmc-sensor-processing:source")
api("us.ihmc:ihmc-whole-body-controller:source")
api("us.ihmc:ihmc-humanoid-robotics:source")
}

testDependencies {
Expand Down
3 changes: 0 additions & 3 deletions ihmc-parameter-estimation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ ihmc {
}

mainDependencies {
api("us.ihmc:mecano:17-0.18.1")
api("us.ihmc:log-tools:0.6.3")
api("us.ihmc:ihmc-robotics-toolkit:source")
api("us.ihmc:ihmc-robot-models:source")
}

Expand Down
2 changes: 0 additions & 2 deletions ihmc-parameter-tuner/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ mainDependencies {
api("jakarta.xml.bind:jakarta.xml.bind-api:2.3.2")
api("org.glassfish.jaxb:jaxb-runtime:2.3.2")

api("us.ihmc:ihmc-javafx-toolkit:17-0.22.9")
api("us.ihmc:ihmc-robot-data-logger:0.29.1")
api("us.ihmc:ihmc-graphics-javafx:source")
api("us.ihmc:ihmc-robotics-toolkit:source")

var javaFXVersion = "17.0.9"
api(ihmc.javaFXModule("base", javaFXVersion))
Expand Down
Loading

0 comments on commit 101aa24

Please sign in to comment.