Przeglądaj źródła

Cherry pick fix for engine version dependencies update (#727)

* Update ROS2 and related gems that were pointing to version 4.1.0 of the engine sdk to use the stabilization/2409 candidate version of 2.3.0 and add a new version of each of the updated gems
* Update to include template updates based on a separate [PR](https://github.com/o3de/o3de-extras/pull/721)
* Bumped version of the robot templates to 2.0.0 to reflect version bump of its related gem

Signed-off-by: Steve Pham <[email protected]>
Steve Pham 1 rok temu
rodzic
commit
3db6b363bc

+ 2 - 2
Gems/ProteusRobot/gem.json

@@ -1,6 +1,6 @@
 {
     "gem_name": "ProteusRobot",
-    "version": "1.1.0",
+    "version": "2.0.0",
     "display_name": "Proteus Robot",
     "license": "Apache-2.0 or MIT",
     "license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -30,6 +30,6 @@
     ],
     "engine_api_dependencies": [],
     "restricted": "ProteusRobot",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/proteusrobot-1.1.0-gem.zip"
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/proteusrobot-2.0.0-gem.zip"
 }
 

+ 2 - 2
Gems/RosRobotSample/gem.json

@@ -1,6 +1,6 @@
 {
     "gem_name": "RosRobotSample",
-    "version": "1.1.0",
+    "version": "2.0.0",
     "display_name": "ROS Robot Sample",
     "license": "Apache-2.0 or MIT",
     "license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -29,6 +29,6 @@
     ],
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
     "restricted": "",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/rosrobotsample-1.1.0-gem.zip"
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/rosrobotsample-2.0.0-gem.zip"
 }
 

+ 2 - 2
Gems/WarehouseAutomation/gem.json

@@ -1,6 +1,6 @@
 {
     "gem_name": "WarehouseAutomation",
-    "version": "1.1.0",
+    "version": "2.0.0",
     "display_name": "Warehouse Automation",
     "license": "Apache-2.0",
     "license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -28,6 +28,6 @@
     ],
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
     "restricted": "WarehouseAutomation",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/warehouseautomation-1.1.0-gem.zip"
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/warehouseautomation-2.0.0-gem.zip"
 }
 

+ 2 - 2
Templates/Ros2FleetRobotTemplate/Template/project.json

@@ -18,7 +18,7 @@
         "Gem"
     ],
     "restricted": "${Name}",
-    "engine_version": "1.0.0",
+    "engine_version": "2.3.0",
     "gem_names": [
         "Atom",
         "CameraFramework",
@@ -32,7 +32,7 @@
         "PhysX5",
         "PrimitiveAssets",
         "PrefabBuilder",
-        "ProteusRobot>=1.1.0",
+        "ProteusRobot>=2.0.0",
         "ROS2>=3.1.0",
         "ScriptCanvasPhysics",
         "ScriptEvents",

+ 2 - 2
Templates/Ros2FleetRobotTemplate/template.json

@@ -1,6 +1,6 @@
 {
     "template_name": "Ros2FleetRobotTemplate",
-    "version": "1.2.0",
+    "version": "2.0.0",
     "origin": "Open 3D Engine Extras",
     "origin_url": "https://github.com/o3de/o3de-extras",
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
@@ -489,5 +489,5 @@
             "dir": "Examples/ros2_ws/src/o3de_fleet_nav/test"
         }
     ],
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2fleetrobottemplate-1.2.0-template.zip"
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2fleetrobottemplate-2.0.0-template.zip"
 }

+ 1 - 1
Templates/Ros2ProjectTemplate/Template/project.json

@@ -34,7 +34,7 @@
         "PrimitiveAssets",
         "PrefabBuilder",
         "ROS2>=3.1.0",
-        "RosRobotSample>=1.1.0",
+        "RosRobotSample>=2.0.0",
         "SaveData",
         "ScriptCanvasPhysics",
         "ScriptEvents",

+ 2 - 2
Templates/Ros2ProjectTemplate/template.json

@@ -1,6 +1,6 @@
 {
     "template_name": "Ros2ProjectTemplate",
-    "version": "1.1.0",
+    "version": "2.0.0",
     "origin": "Open 3D Engine Extras",
     "origin_url": "https://github.com/o3de/o3de-extras",
     "license": "https://github.com/o3de/o3de-extras/tree/development/Templates/Ros2ProjectTemplate/Template/LICENSE.txt",
@@ -553,5 +553,5 @@
         }
     ],
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2projecttemplate-1.1.0-template.zip"
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2projecttemplate-2.0.0-template.zip"
 }

+ 2 - 2
Templates/Ros2RoboticManipulationTemplate/Template/project.json

@@ -18,7 +18,7 @@
         "Gem"
     ],
     "restricted": "MySimulationProject",
-    "engine_version": "4.1.0",
+    "engine_version": "2.3.0",
     "gem_names": [
         "Atom",
         "CameraFramework",
@@ -39,7 +39,7 @@
         "DiffuseProbeGrid",
         "Compression",
         "WarehouseAssets",
-        "WarehouseAutomation>=1.1.0",
+        "WarehouseAutomation>=2.0.0",
         "ROS2>=3.1.0"
     ]
 }

+ 3 - 3
Templates/Ros2RoboticManipulationTemplate/template.json

@@ -1,6 +1,6 @@
 {
     "template_name": "Ros2RoboticManipulationTemplate",
-    "version": "1.1.0",
+    "version": "2.0.0",
     "origin": "https://github.com/o3de/o3de-extras",
     "license": "https://github.com/o3de/o3de-extras/tree/development/Templates/Ros2RoboticManipulationTemplate/Template/LICENSE.txt",
     "display_name": "ROS2 Robotic Manipulation",
@@ -830,5 +830,5 @@
         }
     ],
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2roboticmanipulationtemplate-1.1.0-template.zip"
-}
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2roboticmanipulationtemplate-2.0.0-template.zip"
+}

Plik diff jest za duży
+ 752 - 231
repo.json


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików