⬆️ ihmc-robot-data-logger 0.31.1, javacpp dependency fixup (#203)

ihmcrobotics · Feb 5, 2025 · 051b7f4 · 051b7f4
1 parent 6148286
commit 051b7f4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git a/scs2-bullet-simulation/build.gradle.kts b/scs2-bullet-simulation/build.gradle.kts
@@ -9,8 +9,6 @@ ihmc {
    configurePublications()
 }
 
-val javaCPPVersion = "1.5.9"
-
 mainDependencies {
    api("us.ihmc:scs2-simulation:source")
    api("us.ihmc:scs2-definition:source")
@@ -21,8 +19,10 @@ mainDependencies {
    api("us.ihmc:ihmc-yovariables:0.13.4")
    api("us.ihmc:mecano-yovariables:17-0.19.0")
 
-   apiBytedecoNatives("javacpp")
-   apiBytedecoNatives("bullet", "3.25-")
+   val bulletVersion = "3.25-1.5.11-ihmc-2"
+   api("us.ihmc:bullet:$bulletVersion")
+   api("us.ihmc:bullet:$bulletVersion:linux-x86_64")
+   api("us.ihmc:bullet:$bulletVersion:windows-x86_64")
 }
 
 debugDependencies {
@@ -33,18 +33,3 @@ debugDependencies {
 testDependencies {
    api("us.ihmc:scs2-session-visualizer-jfx:source")
 }
-
-fun us.ihmc.build.IHMCDependenciesExtension.apiBytedecoNatives(name: String, versionPrefix: String = "")
-{
-   apiBytedecoSelective("org.bytedeco:$name:$versionPrefix$javaCPPVersion")
-   apiBytedecoSelective("org.bytedeco:$name:$versionPrefix$javaCPPVersion:linux-x86_64")
-   apiBytedecoSelective("org.bytedeco:$name:$versionPrefix$javaCPPVersion:windows-x86_64")
-   apiBytedecoSelective("org.bytedeco:$name:$versionPrefix$javaCPPVersion:macosx-x86_64")
-}
-
-fun us.ihmc.build.IHMCDependenciesExtension.apiBytedecoSelective(dependencyNotation: String)
-{
-   api(dependencyNotation) {
-      exclude(group = "org.bytedeco")
-   }
-}
diff --git a/scs2-examples/build.gradle.kts b/scs2-examples/build.gradle.kts
@@ -11,7 +11,6 @@ ihmc {
 
 mainDependencies {
    api("org.fxyz3d:fxyz3d:0.6.0")
-   api("org.bytedeco:javacv-platform:1.5.9")
 
    api("us.ihmc:scs2-simulation-construction-set:source")
    api("us.ihmc:scs2-session-visualizer-jfx:source")

diff --git a/scs2-session-logger/build.gradle.kts b/scs2-session-logger/build.gradle.kts
@@ -13,7 +13,7 @@ mainDependencies {
    api("us.ihmc:scs2-session:source")
    api("us.ihmc:scs2-simulation:source") // TODO Need to fix this, it needs the Robot.
 
-   api("us.ihmc:ihmc-robot-data-logger:0.29.10")
+   api("us.ihmc:ihmc-robot-data-logger:0.31.1")
    api("com.github.luben:zstd-jni:1.5.5-10")
    api("org.antlr:antlr4-runtime:4.13.1")
    //api("org.lz4:lz4-java:1.8.0")

diff --git a/scs2-session-visualizer-jfx/build.gradle.kts b/scs2-session-visualizer-jfx/build.gradle.kts
@@ -31,7 +31,6 @@ mainDependencies {
    api("us.ihmc:ihmc-video-codecs:2.1.6")
    api("us.ihmc:ihmc-javafx-extensions:17-0.2.1")
    api("us.ihmc:ihmc-messager-javafx:0.2.1")
-   api("org.bytedeco:javacv-platform:1.5.9")
 
    api("org.reflections:reflections:0.9.11")