Update version to 2.3.1

NREL · Dec 4, 2017 · 9b0fc45 · 9b0fc45 · nrel-bot-3 · Dec 4, 2017
1 parent 79d08bf
commit 9b0fc45
Show file tree

Hide file tree

Showing 5 changed files with 28,787 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(OpenStudioMeta)
 
 set(CMAKE_VERSION_MAJOR 2)
 set(CMAKE_VERSION_MINOR 3)
-set(CMAKE_VERSION_PATCH 0)
+set(CMAKE_VERSION_PATCH 1)
 
 set(CMAKE_VERSION_BUILD "Unknown" CACHE STRING "Build number")
 find_package(Git)

diff --git a/openstudiocore/CMakeLists.txt b/openstudiocore/CMakeLists.txt
@@ -9,7 +9,7 @@ if(CCACHE_PROGRAM)
 endif()
 
 
-project(OpenStudio VERSION 2.3.0)
+project(OpenStudio VERSION 2.3.1)
 
 include(ExternalProject)
 include(CPackComponent)

diff --git a/openstudiocore/resources/model/OpenStudio.idd b/openstudiocore/resources/model/OpenStudio.idd
@@ -1,4 +1,4 @@
-!IDD_Version 2.3.0
+!IDD_Version 2.3.1
 ! *****************************************************************************
 ! This file is the Input Data Dictionary (IDD) for OpenStudio Model.
 !

diff --git a/openstudiocore/src/osversion/VersionTranslator.cpp b/openstudiocore/src/osversion/VersionTranslator.cpp
@@ -119,6 +119,7 @@ VersionTranslator::VersionTranslator()
   m_updateMethods[VersionString("2.1.1")] = &VersionTranslator::update_2_1_0_to_2_1_1;
   m_updateMethods[VersionString("2.1.2")] = &VersionTranslator::update_2_1_1_to_2_1_2;
   m_updateMethods[VersionString("2.3.0")] = &VersionTranslator::update_2_1_2_to_2_3_0;
+  m_updateMethods[VersionString("2.3.1")] = &VersionTranslator::defaultUpdate;
 
   // List of previous versions that may be updated to this one.
   //   - To increment the translator, add an entry for the version just released (branched for
@@ -250,6 +251,7 @@ VersionTranslator::VersionTranslator()
   m_startVersions.push_back(VersionString("2.2.0"));
   m_startVersions.push_back(VersionString("2.2.1"));
   m_startVersions.push_back(VersionString("2.2.2"));
+  m_startVersions.push_back(VersionString("2.3.0"));
 }
 
 boost::optional<model::Model> VersionTranslator::loadModel(const openstudio::path& pathToOldOsm,