Merging master branch #28
Conversation
Upgrades Gradle and Android build tools versions.
Reintroduce the license - master branch
Maven style open ranges and version bump.
Change plugin from ros-java to ros.
Switch to uploadArchives.
Fix Python2/Python3 clash.
Conflicts: CHANGELOG.rst CMakeLists.txt cmake/rosjava.cmake.em env-hooks/15.rosjava.bash.em env-hooks/15.rosjava.sh.em package.xml src/rosjava_build_tools/create_android_project.py src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.properties src/rosjava_build_tools/release.py src/rosjava_build_tools/templates/android_package/build.gradle.in src/rosjava_build_tools/templates/android_project/build.gradle.in src/rosjava_build_tools/templates/rosjava_msg_project/build.gradle.in src/rosjava_build_tools/templates/rosjava_package/CMakeLists.txt.in src/rosjava_build_tools/templates/rosjava_package/build.gradle.in src/rosjava_build_tools/templates/rosjava_project/build.gradle.in
|
So there's good news and bad news. 👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there. 😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request. Note to project maintainer: This is a terminal state, meaning the |
|
Note to the @googlebot : all these commits are already in the repository, this is only a merge from two different branches, so no new content besides that added by myself is included here. |
adamantivm
force-pushed
the
obsolete/master
branch
from
737509f to
dde3104
Compare
|
@stonier I left the sample target as it was and added more context to rosjava/rosjava_bootstrap#1 so that we can more thoroughly go and change things everywhere later. |
Nothing much there besides a long parallel commit history and a few comment nits.
@stonier another pair of eyes just in case?