Skip to content

Fix source 6 warnings #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 2, 2021
Merged

Fix source 6 warnings #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7df9c58
Remove target 1.6, ignore warnings about deprecated options
ivanpauno May 12, 2021
561df98
Only add flags if they weren't specified internally
ivanpauno May 12, 2021
02fb664
Don't pass java compile flags in CMake, instead do that in CI
ivanpauno May 13, 2021
4afcb0e
Build both with java 6 and default java version
ivanpauno May 13, 2021
18e24fd
Fix CI
ivanpauno May 13, 2021
2688e4e
fail-fast: false
ivanpauno May 13, 2021
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
29 changes: 25 additions & 4 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,28 @@ on: [push]

jobs:
build_and_test:
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
rosdistro: [rolling]
os: [ubuntu-20.04]
java_version: [6, default]
include:
- java_version: 6
colcon_defaults: |
{
"build": {
"cmake-args": [
"-DCMAKE_JAVA_COMPILE_FLAGS=-source;1.6;-target;1.6;-Xlint:-options",
"--no-warn-unused-cli"
]
}
}
- java_version: default
colcon_defaults: |
{
}
runs-on: ${{matrix.os}}
steps:
- name: Install Java
run: |
Expand All @@ -13,13 +34,13 @@ jobs:
- uses: actions/checkout@v2
- uses: ros-tooling/setup-ros@v0.2
with:
required-ros-distributions: rolling
required-ros-distributions: ${{matrix.rosdistro}}
- uses: ros-tooling/action-ros-ci@master
with:
package-name: rosidl_generator_java rcljava_common rcljava
target-ros2-distro: rolling
target-ros2-distro: ${{matrix.rosdistro}}
vcs-repo-file-url: ${{ github.workspace }}/ros2_java_desktop.repos

colcon-defaults: ${{matrix.colcon_defaults}}
# build_android:
# runs-on: ubuntu-18.04
# steps:
Expand Down
2 changes: 0 additions & 2 deletions rcljava/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ if(NOT WIN32)
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.6" "-target" "1.6")

include_directories(include)

function(set_properties _target_name _build_type)
Expand Down
2 changes: 0 additions & 2 deletions rcljava_common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ if(NOT WIN32)
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.6" "-target" "1.6")

set(${PROJECT_NAME}_java_sources
"src/main/java/org/ros2/rcljava/common/JNIUtils.java"
"src/main/java/org/ros2/rcljava/exceptions/RCLException.java"
Expand Down