Skip to content
This repository was archived by the owner on Nov 9, 2022. It is now read-only.

Upgrade Gradle version to 4.7 for ROS Melodic #40

Closed
SomeshDaga wants to merge 1 commit into from
Closed

Upgrade Gradle version to 4.7 for ROS Melodic #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rosjava_build_tools/gradle/Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
This is not installed, but it gets used to generate the gradle wrapper for a project.

It is currently the gradle wrapper supporting gradle 3.5.1
It is currently the gradle wrapper supporting gradle 4.7
Binary file modified src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Fri Jan 26 13:47:21 ART 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip
11 changes: 8 additions & 3 deletions src/rosjava_build_tools/gradle/gradlew
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions src/rosjava_build_tools/templates/android_package/build.gradle.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*/

task wrapper(type: Wrapper) {
gradleVersion = '3.5.1'
gradleVersion = '4.7'
}

buildscript {
apply from: "https://github.com/rosjava/android_core/raw/kinetic/buildscript.gradle"
apply from: "https://raw.githubusercontent.com/akrobotics/rosjava_bootstrap/feat-gradle-version-melodic/buildscript.gradle"
}

apply plugin: 'catkin'
Expand Down
4 changes: 2 additions & 2 deletions src/rosjava_build_tools/templates/rosjava_package/build.gradle.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*/

task wrapper(type: Wrapper) {
gradleVersion = '3.5.1'
gradleVersion = '4.7'
}

buildscript {
apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/kinetic/buildscript.gradle"
apply from: "https://raw.githubusercontent.com/akrobotics/rosjava_bootstrap/feat-gradle-version-melodic/buildscript.gradle"
}

apply plugin: 'catkin'
Expand Down