From fe0f551ce4ee92d73a5dbb0de2abf8520cc277df Mon Sep 17 00:00:00 2001 From: anchapin Date: Fri, 20 Jun 2025 12:27:00 -0400 Subject: [PATCH 1/2] Bump version to 3.10.0 and update Xcode developer path Updates version numbers in CMakeLists.txt and package files while changing the macOS build workflow to use Xcode 13.2.1 instead of 11.7. --- .github/workflows/build_pat.yaml | 2 +- CMakeLists.txt | 2 +- app/package-lock.json | 4 ++-- app/package.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_pat.yaml b/.github/workflows/build_pat.yaml index c731dcd2..02c6a2e1 100755 --- a/.github/workflows/build_pat.yaml +++ b/.github/workflows/build_pat.yaml @@ -31,7 +31,7 @@ jobs: allow_failure: false MACOSX_DEPLOYMENT_TARGET: 10.15 SDKROOT: /Applications/Xcode_11.7.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk - DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer - name: Windows_2022 os: windows-2022 node-version: 18 diff --git a/CMakeLists.txt b/CMakeLists.txt index dd1383e1..51a4cd62 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14.0) cmake_policy(SET CMP0048 NEW) -project(ParametricAnalysisTool VERSION 3.9.1) +project(ParametricAnalysisTool VERSION 3.10.0) find_package(Git) diff --git a/app/package-lock.json b/app/package-lock.json index 046c328d..1c246c91 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,12 +1,12 @@ { "name": "pat", - "version": "3.9.1", + "version": "3.10.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "pat", - "version": "3.9.1", + "version": "3.10.0", "dependencies": { "@electron/remote": "~2.0.8", "adm-zip": "~0.5.9", diff --git a/app/package.json b/app/package.json index cd85b4b7..1394f2bd 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "ParametricAnalysisTool", "identifier": "gov.nrel.openstudio.pat", "description": "OpenStudio Parametric Analysis Tool", - "version": "3.9.1", + "version": "3.10.0", "author": "National Renewable Energy Laboratory", "main": "background.js", "dependencies": { diff --git a/package-lock.json b/package-lock.json index 52608caf..455c407a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "openstudio-pat", - "version": "3.9.1", + "version": "3.10.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "openstudio-pat", - "version": "3.9.1", + "version": "3.10.0", "hasInstallScript": true, "devDependencies": { "@babel/core": "~7.19.3", diff --git a/package.json b/package.json index 8a90f161..6dab1d92 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openstudio-pat", - "version": "3.9.1", + "version": "3.10.0", "devDependencies": { "@babel/core": "~7.19.3", "@babel/eslint-parser": "~7.19.1", From 4079ffd6557652c359a6c84809a0dbaff16ec0bf Mon Sep 17 00:00:00 2001 From: tijcolem Date: Fri, 20 Jun 2025 11:11:30 -0600 Subject: [PATCH 2/2] update OpenStudio, gem and E+ for 3.10 --- manifest.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest.json b/manifest.json index 7e323ba3..d375db7f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,17 +1,17 @@ { "endpoint": "https://openstudio-resources.s3.amazonaws.com/pat-dependencies3/", "energyplus": [{ - "name": "EnergyPlus-24.2.0-win32.tar.gz", + "name": "EnergyPlus-25.1.0-win32.tar.gz", "platform": "win32", "arch": "x64", "type": "energyplus" }, { - "name": "EnergyPlus-24.2.0-darwin.tar.gz", + "name": "EnergyPlus-25.1.0-darwin.tar.gz", "platform": "darwin", "arch": "x64", "type": "energyplus" }, { - "name": "EnergyPlus-24.2.0-linux.tar.gz", + "name": "EnergyPlus-25.1.0-linux.tar.gz", "platform": "linux", "arch": "x64", "type": "energyplus" @@ -49,33 +49,33 @@ "type": "mongo" }], "openstudio": [{ - "name": "OpenStudio-3.9.0-Windows.tar.gz", + "name": "OpenStudio-3.10.0-Windows.tar.gz", "platform": "win32", "arch": "x64", "type": "openstudio" }, { - "name": "OpenStudio-3.9.0-Darwin.tar.gz", + "name": "OpenStudio-3.10.0-Darwin.tar.gz", "platform": "darwin", "arch": "x64", "type": "openstudio" }, { - "name": "OpenStudio-3.9.0-Linux.tar.gz", + "name": "OpenStudio-3.10.0-Linux.tar.gz", "platform": "linux", "arch": "x64", "type": "OpenStudio" }], "openstudioServer": [{ - "name": "OpenStudio-server-415ae851b8-win32.tar.gz", + "name": "OpenStudio-server-5873e0d21d-win32.tar.gz", "platform": "win32", "arch": "x64", "type": "OpenStudio-server" }, { - "name": "OpenStudio-server-415ae851b8-darwin.tar.gz", + "name": "OpenStudio-server-5873e0d21d-darwin.tar.gz", "platform": "darwin", "arch": "x64", "type": "OpenStudio-server" }, { - "name": "OpenStudio-server-415ae851b8-linux.tar.gz", + "name": "OpenStudio-server-5873e0d21d-linux.tar.gz", "platform": "linux", "arch": "x64", "type": "OpenStudio-server"