Skip to content

Commit

Permalink
Update gradle version and fix dependencies
Browse files Browse the repository at this point in the history
see rosjava#27 for an example
of the required dependencies
  • Loading branch information
rf-eng committed Mar 10, 2021
1 parent eb015a5 commit 0095ac5
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 17 deletions.
9 changes: 7 additions & 2 deletions android_all_sensors_driver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,15 @@

apply plugin: "com.android.application"

// see: https://github.com/rosjava/android_extras/issues/27
//noinspection GroovyAssignabilityCheck
dependencies {
compile 'org.ros.android_core:android_core_components:[0.4,0.5)'
compile group: 'org.opencv', name: 'openCVLibrary', version: '3.4.0'
implementation 'org.ros.android_core:android_core_components:[0.4,0.5)'
implementation group: 'org.opencv', name: 'openCVLibrary', version: '3.4.0'
implementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
implementation "org.ros.rosjava_bootstrap:message_generation:0.3.3"
implementation "org.apache.commons:com.springsource.org.apache.commons.logging:[1.1.1,1.2)"
implementation 'org.ros.rosjava_messages:geometry_msgs:[1.12, 1.13)'
}

android {
Expand Down
9 changes: 7 additions & 2 deletions android_tutorial_cv_bridge_CompressedImage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@ apply plugin: 'com.android.application'

//noinspection GroovyAssignabilityCheck
dependencies {
compile 'org.ros.android_core:android_core_components:[0.4,0.5)'
compile project(":cv_bridge")
implementation 'org.ros.android_core:android_core_components:[0.4,0.5)'
implementation project(":cv_bridge")
implementation "org.opencv:openCVLibrary:3.4.0"
implementation "org.ros.rosjava_bootstrap:message_generation:0.3.3"
implementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
implementation "com.github.rosjava.rosjava_extras:image:[0.3,0.4)" //for sensor_msgs.ImageEncodings
implementation "org.apache.commons:com.springsource.org.apache.commons.logging:[1.1.1,1.2)"
}

android {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@ apply plugin: 'com.android.application'

//noinspection GroovyAssignabilityCheck
dependencies {
compile 'org.ros.android_core:android_core_components:[0.4,0.5)'
compile "com.github.rosjava.rosjava_extras:cv_bridge_javacv:[0.3,0.4]"
implementation 'org.ros.android_core:android_core_components:[0.4,0.5)'
implementation "com.github.rosjava.rosjava_extras:cv_bridge_javacv:[0.3,0.4]"
implementation "org.bytedeco.javacpp-presets:opencv:2.4.11-0.11"
implementation "org.ros.rosjava_bootstrap:message_generation:0.3.3"
implementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
implementation "com.github.rosjava.rosjava_extras:image:[0.3,0.4)" //for sensor_msgs.ImageEncodings
implementation "org.apache.commons:com.springsource.org.apache.commons.logging:[1.1.1,1.2)"
}

android {
Expand Down
9 changes: 7 additions & 2 deletions android_tutorial_cv_bridge_Image/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@ apply plugin: 'com.android.application'

//noinspection GroovyAssignabilityCheck
dependencies {
compile 'org.ros.android_core:android_core_components:[0.4,0.5)'
compile project(":cv_bridge")
implementation 'org.ros.android_core:android_core_components:[0.4,0.5)'
implementation project(":cv_bridge")
implementation "org.opencv:openCVLibrary:3.4.0"
implementation "org.ros.rosjava_bootstrap:message_generation:0.3.3"
implementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
implementation "com.github.rosjava.rosjava_extras:image:[0.3,0.4)"
implementation "org.apache.commons:com.springsource.org.apache.commons.logging:[1.1.1,1.2)"
}

android {
Expand Down
11 changes: 9 additions & 2 deletions android_tutorial_cv_bridge_Image_javacv/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,15 @@ apply plugin: 'com.android.application'

//noinspection GroovyAssignabilityCheck
dependencies {
compile 'org.ros.android_core:android_core_components:[0.4,0.5)'
compile "com.github.rosjava.rosjava_extras:cv_bridge_javacv:[0.3,0.4]"
implementation 'org.ros.android_core:android_core_components:[0.4,0.5)'
implementation "com.github.rosjava.rosjava_extras:cv_bridge_javacv:[0.3,0.4]"
implementation "org.bytedeco.javacpp-presets:opencv:2.4.11-0.11"
implementation "org.ros.rosjava_bootstrap:message_generation:0.3.3"
implementation 'org.ros.rosjava_messages:sensor_msgs:1.12.7'
implementation 'org.ros.rosjava_messages:std_srvs:1.11.2'
implementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
implementation "com.github.rosjava.rosjava_extras:image:[0.3,0.4)"
implementation "org.apache.commons:com.springsource.org.apache.commons.logging:[1.1.1,1.2)"
}

android {
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* the License.
*/

task wrapper(type: Wrapper) {
gradleVersion = "4.10.2"
wrapper {
gradleVersion = "5.4.1"
}

buildscript {
Expand Down
11 changes: 7 additions & 4 deletions cv_bridge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@ apply plugin: "com.android.library"

//noinspection GroovyAssignabilityCheck
dependencies {
compile "org.ros.rosjava_core:rosjava:[0.3,0.4)"
compile "org.ros.rosjava_messages:sensor_msgs:[1.12,1.13)"
compile "com.github.rosjava.rosjava_extras:image:[0.3,0.4)"
compile group: 'org.opencv', name: 'openCVLibrary', version: '3.4.0'
implementation "org.ros.rosjava_core:rosjava:[0.3,0.4)"
implementation "org.ros.rosjava_messages:sensor_msgs:[1.12,1.13)"
implementation "com.github.rosjava.rosjava_extras:image:[0.3,0.4)"
implementation group: 'org.opencv', name: 'openCVLibrary', version: '3.4.0'
implementation 'com.android.tools.build:aapt2:4.1.2-6503028'
implementation "org.ros.rosjava_bootstrap:message_generation:0.3.3"
implementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
}


Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 0095ac5

Please sign in to comment.