Merged in bump_4 (pull request #508)

Bump default to 4.0.0 Approved-by: Louise Poubel <[email protected]>
gazebosim · Jan 23, 2020 · 4989abb · 4989abb
2 parents 03af709 + 33737d1
commit 4989abb
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-gazebo3 VERSION 3.0.0)
+project(ignition-gazebo4 VERSION 4.0.0)
 
 #============================================================================
 # Find ignition-cmake
@@ -14,7 +14,7 @@ find_package(ignition-cmake2 REQUIRED)
 #============================================================================
 # Configure the project
 #============================================================================
-ign_configure_project(VERSION_SUFFIX pre2)
+ign_configure_project(VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options

diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,9 @@
+## Ignition Gazebo 4.x
+
+### Ignition Gazebo 4.X.X
+
+### Ignition Gazebo 4.0.0 (20XX-XX-XX)
+
 ## Ignition Gazebo 3.x
 
 ### Ignition Gazebo 3.X.X

diff --git a/README.md b/README.md
@@ -122,7 +122,7 @@ installing Ignition Gazebo from source.
 2. Install Ignition Gazebo
 
     ```
-    sudo apt-get install libignition-gazebo2-dev
+    sudo apt-get install libignition-gazebo4-dev
     ```
 
 ## Source Install (version 3)

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
@@ -28,14 +28,14 @@ pipelines:
               libignition-tools-dev
               libignition-transport8-dev
               libsdformat9-dev
-              # libignition-fuel-tools4-dev
-              # libignition-physics2-dev
-              # libignition-sensors3-dev
+              libignition-fuel-tools4-dev
+              libignition-physics2-dev
+              libignition-sensors3-dev
           # METHOD 2: Build from source
           # Build dependencies from source using a given branch
-          - docker/scripts/build_ign.sh ignitionrobotics ign-sensors default
-          - docker/scripts/build_ign.sh ignitionrobotics ign-physics default
-          - docker/scripts/build_ign.sh ignitionrobotics ign-fuel-tools default
+          # - docker/scripts/build_ign.sh ignitionrobotics ign-sensors default
+          # - docker/scripts/build_ign.sh ignitionrobotics ign-physics default
+          # - docker/scripts/build_ign.sh ignitionrobotics ign-fuel-tools default
           # Build Ignition Gazebo
           - ./tools/clang_tidy.sh
           - mkdir build

diff --git a/examples/plugin/custom_component/CMakeLists.txt b/examples/plugin/custom_component/CMakeLists.txt
@@ -7,11 +7,11 @@ project(CustomComponentPlugin)
 find_package(ignition-plugin1 REQUIRED COMPONENTS register)
 set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
-find_package(ignition-gazebo3 REQUIRED)
+find_package(ignition-gazebo4 REQUIRED)
 add_library(CustomComponentPlugin SHARED
   CustomComponentPlugin.cc
 )
 set_property(TARGET CustomComponentPlugin PROPERTY CXX_STANDARD 17)
 target_link_libraries(CustomComponentPlugin
   PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
-  PRIVATE ignition-gazebo3::ignition-gazebo3)
+  PRIVATE ignition-gazebo4::ignition-gazebo4)
diff --git a/examples/plugin/system_plugin/CMakeLists.txt b/examples/plugin/system_plugin/CMakeLists.txt
@@ -7,9 +7,9 @@ project(SampleSystem)
 find_package(ignition-plugin1 REQUIRED COMPONENTS register)
 set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
-find_package(ignition-gazebo3 REQUIRED)
+find_package(ignition-gazebo4 REQUIRED)
 add_library(SampleSystem SHARED SampleSystem.cc SampleSystem2.cc)
 set_property(TARGET SampleSystem PROPERTY CXX_STANDARD 17)
 target_link_libraries(SampleSystem
   PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
-  PRIVATE ignition-gazebo3::ignition-gazebo3)
+  PRIVATE ignition-gazebo4::ignition-gazebo4)
diff --git a/examples/standalone/each_performance/CMakeLists.txt b/examples/standalone/each_performance/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(ignition-gazebo3 QUIET REQUIRED)
+find_package(ignition-gazebo4 QUIET REQUIRED)
 
 add_executable(each each.cc)
 target_link_libraries(each
-  ignition-gazebo3::core)
+  ignition-gazebo4::core)