Skip to content

Commit

Permalink
Merge pull request ernestmc#5 from benmaidel/feature/update_gradle
Browse files Browse the repository at this point in the history
Update Gradle version
  • Loading branch information
fmessmer authored Nov 22, 2020
2 parents 75f1e57 + 124bac1 commit f79833b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* the License.
*/


buildscript {
try{
apply from: "https://raw.githubusercontent.com/mojin-robotics/rosjava_bootstrap/kinetic/buildscript.gradle"
Expand All @@ -28,15 +27,15 @@ plugins {
id "org.sonarqube" version "2.6.2"
}

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

apply plugin: 'catkin'
apply plugin: 'ros-java'
sourceCompatibility = 1.8
targetCompatibility = 1.8

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

repositories {
mavenLocal()
mavenCentral()
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Wed Mar 14 09:44:21 CET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip

0 comments on commit f79833b

Please sign in to comment.