From 60c60a61df0210723aa4b32b63149ecbe62ed3b3 Mon Sep 17 00:00:00 2001 From: peifeng-unity Date: Thu, 15 Jul 2021 16:43:46 -0700 Subject: [PATCH 1/3] upgrade-manifest --- .../pick_and_place/PickAndPlaceProject/Packages/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutorials/pick_and_place/PickAndPlaceProject/Packages/manifest.json b/tutorials/pick_and_place/PickAndPlaceProject/Packages/manifest.json index 3b5463ba..b5d47257 100644 --- a/tutorials/pick_and_place/PickAndPlaceProject/Packages/manifest.json +++ b/tutorials/pick_and_place/PickAndPlaceProject/Packages/manifest.json @@ -3,8 +3,8 @@ "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.8", "com.unity.ide.vscode": "1.2.3", - "com.unity.robotics.ros-tcp-connector": "https://github.com/Unity-Technologies/ROS-TCP-Connector.git?path=/com.unity.robotics.ros-tcp-connector#dev", - "com.unity.robotics.urdf-importer": "https://github.com/Unity-Technologies/URDF-Importer.git?path=/com.unity.robotics.urdf-importer#dev", + "com.unity.robotics.ros-tcp-connector": "https://github.com/Unity-Technologies/ROS-TCP-Connector.git?path=/com.unity.robotics.ros-tcp-connector#v0.5.0", + "com.unity.robotics.urdf-importer": "https://github.com/Unity-Technologies/URDF-Importer.git?path=/com.unity.robotics.urdf-importer#v0.5.0", "com.unity.test-framework": "1.1.24", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.4.8", From 2ba250bbf635b57923ad33ceacb1024b98f28206 Mon Sep 17 00:00:00 2001 From: peifeng-unity Date: Thu, 15 Jul 2021 16:50:49 -0700 Subject: [PATCH 2/3] upgrade versions in doc and dockerfile --- tutorials/quick_setup.md | 2 +- tutorials/ros_unity_integration/ros2_docker/Dockerfile | 2 +- tutorials/ros_unity_integration/ros_docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tutorials/quick_setup.md b/tutorials/quick_setup.md index 04cbf438..bd90fbd3 100644 --- a/tutorials/quick_setup.md +++ b/tutorials/quick_setup.md @@ -11,7 +11,7 @@ This page provides brief instructions on installing the Unity Robotics packages. ![](../images/packman.png) -1. Enter the git URL for the desired package. Note: you can append a version tag to the end of the git url, like `#v0.3.0` or `#v0.4.0`, to declare a specific package version, or exclude the tag to get the latest from the package's `main` branch. +1. Enter the git URL for the desired package. Note: you can append a version tag to the end of the git url, like `#v0.4.0` or `#v0.5.0`, to declare a specific package version, or exclude the tag to get the latest from the package's `main` branch. 1. For the [ROS-TCP-Connector](https://github.com/Unity-Technologies/ROS-TCP-Connector), enter `https://github.com/Unity-Technologies/ROS-TCP-Connector.git?path=/com.unity.robotics.ros-tcp-connector`. 1. For the [URDF-Importer](https://github.com/Unity-Technologies/URDF-Importer), enter `https://github.com/Unity-Technologies/URDF-Importer.git?path=/com.unity.robotics.urdf-importer`. diff --git a/tutorials/ros_unity_integration/ros2_docker/Dockerfile b/tutorials/ros_unity_integration/ros2_docker/Dockerfile index 0a6c39fb..1daec65a 100644 --- a/tutorials/ros_unity_integration/ros2_docker/Dockerfile +++ b/tutorials/ros_unity_integration/ros2_docker/Dockerfile @@ -7,7 +7,7 @@ RUN mkdir -p /home/dev_ws/src COPY ./ros2_packages/ /home/dev_ws/src #Check out ROS-TCP-Endpoint, ROS2 version -RUN git clone https://github.com/Unity-Technologies/ROS-TCP-Endpoint /home/dev_ws/src/ros_tcp_endpoint -b ROS2 +RUN git clone https://github.com/Unity-Technologies/ROS-TCP-Endpoint /home/dev_ws/src/ros_tcp_endpoint -b ROS2v0.5.0 # Reference script with commands to source workspace COPY ./ros2_docker/source_ros.sh /home/dev_ws/source_ros.sh diff --git a/tutorials/ros_unity_integration/ros_docker/Dockerfile b/tutorials/ros_unity_integration/ros_docker/Dockerfile index f6032c53..f2ea2a15 100644 --- a/tutorials/ros_unity_integration/ros_docker/Dockerfile +++ b/tutorials/ros_unity_integration/ros_docker/Dockerfile @@ -5,7 +5,7 @@ ENV ROS_WORKSPACE=/catkin_ws # Copy packages COPY ./ros_packages/ $ROS_WORKSPACE/src/ -RUN git clone https://github.com/Unity-Technologies/ROS-TCP-Endpoint $ROS_WORKSPACE/src/ros_tcp_endpoint -b laurie/Ros2SinglePackage +RUN git clone https://github.com/Unity-Technologies/ROS-TCP-Endpoint $ROS_WORKSPACE/src/ros_tcp_endpoint -b v0.5.0 COPY ./ros_docker/set-up-workspace /setup.sh #COPY docker/tutorial / From 40e286bd0b0111a50f1dc8369b2145c2992f4729 Mon Sep 17 00:00:00 2001 From: peifeng-unity Date: Thu, 15 Jul 2021 17:24:27 -0700 Subject: [PATCH 3/3] upgrade submodule --- tutorials/pick_and_place/ROS/src/ros_tcp_endpoint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/pick_and_place/ROS/src/ros_tcp_endpoint b/tutorials/pick_and_place/ROS/src/ros_tcp_endpoint index eb3874ac..f978d948 160000 --- a/tutorials/pick_and_place/ROS/src/ros_tcp_endpoint +++ b/tutorials/pick_and_place/ROS/src/ros_tcp_endpoint @@ -1 +1 @@ -Subproject commit eb3874acaa664b2138783689083cb1244aa0e326 +Subproject commit f978d948c35e5c14542839b5f8c2e715c4b61a1d