Merge branch 'develop'

Author: rsjaffe

MIDI2LR.jucer

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="5.4.0.0"
+<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="6.0.0.0"
               bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
               companyWebsite="http://rsjaffe.github.io/MIDI2LR/" companyEmail="[email protected]"
               displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"
               cppLanguageStandard="latest" companyCopyright="Copyright (C) 2015 by Rory Jaffe."
               compilerFlagSchemes="" headerPath="../../external/;" useAppConfig="0"
-              addUsingNamespaceToJuceHeader="0" jucerFormatVersion="1" companyName="Rory Jaffe">
+              addUsingNamespaceToJuceHeader="0" jucerFormatVersion="1" companyName="Rory Jaffe"
+              defines="JUCE_MODAL_LOOPS_PERMITTED=1">
   <MAINGROUP id="XbT1lm" name="MIDI2LR">
     <GROUP id="{FC911F9D-9F68-948C-ADEF-64BE6AA850ED}" name="Source">
       <GROUP id="{00832162-0BDD-383A-E04E-4DEA9A30B434}" name="Icon">
@@ -102,15 +103,15 @@
                hardenedRuntime="1" hardenedRuntimeOptions="com.apple.security.automation.apple-events"
                iosDevelopmentTeamID="VN44PD5JV9" sendAppleEventsPermissionNeeded="1"
                sendAppleEventsPermissionText="MIDI2LR needs to send keystrokes to Lightroom to help automate your tasks."
-               xcodeValidArchs="arm64,x86_64" useLegacyBuildSystem="0" extraDefs="JUCE_MODAL_LOOPS_PERMITTED=1">
+               xcodeValidArchs="arm64,x86_64" useLegacyBuildSystem="0" extraFrameworks="Carbon">
       <CONFIGURATIONS>
-        <CONFIGURATION name="Debug" osxCompatibility="10.15 SDK" osxArchitecture="64BitIntel"
+        <CONFIGURATION name="Debug" osxCompatibility="12.0 SDK" osxArchitecture="64BitIntel"
                        binaryPath="" cppLanguageStandard="c++14" headerPath="../../external/asio/"
                        codeSigningIdentity="Developer ID Application" recommendedWarnings="LLVM"
-                       isDebug="1" linkTimeOptimisation="0" optimisation="1" macOSDeploymentTarget="10.15"/>
-        <CONFIGURATION name="Release" osxCompatibility="10.15 SDK" osxArchitecture="64BitIntel"
+                       isDebug="1" linkTimeOptimisation="0" optimisation="1" macOSDeploymentTarget="12.0"/>
+        <CONFIGURATION name="Release" osxCompatibility="12.0 SDK" osxArchitecture="64BitIntel"
                        binaryPath="" cppLanguageStandard="c++14" headerPath="../../external/asio/"
-                       codeSigningIdentity="Developer ID Application" macOSDeploymentTarget="10.15"/>
+                       codeSigningIdentity="Developer ID Application" macOSDeploymentTarget="12.0"/>
       </CONFIGURATIONS>
       <MODULEPATHS>
         <MODULEPATH id="juce_gui_basics" path="external/JuceLibraryCode/modules"/>
@@ -122,20 +123,20 @@
         <MODULEPATH id="juce_audio_devices" path="external/JuceLibraryCode/modules"/>
       </MODULEPATHS>
     </XCODE_MAC>
-    <VS2022 targetFolder="build/Windows" extraDefs="_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN;JUCE_MODAL_LOOPS_PERMITTED=1"
+    <VS2022 targetFolder="build/Windows" extraDefs="_WIN32_WINNT=0x0A000007;WINVER=0x0A000007;NOMINMAX;WIN32_LEAN_AND_MEAN; _SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING"
             smallIcon="WdgQGt" bigIcon="WdgQGt">
       <CONFIGURATIONS>
         <CONFIGURATION isDebug="1" name="Debug"/>
         <CONFIGURATION isDebug="0" name="Release" useRuntimeLibDLL="0"/>
       </CONFIGURATIONS>
       <MODULEPATHS>
-        <MODULEPATH id="juce_gui_basics"/>
-        <MODULEPATH id="juce_graphics"/>
-        <MODULEPATH id="juce_events"/>
-        <MODULEPATH id="juce_data_structures"/>
-        <MODULEPATH id="juce_core"/>
-        <MODULEPATH id="juce_audio_devices"/>
-        <MODULEPATH id="juce_audio_basics"/>
+        <MODULEPATH id="juce_gui_basics" path="external\JuceLibraryCode\modules"/>
+        <MODULEPATH id="juce_graphics" path="external\JuceLibraryCode\modules"/>
+        <MODULEPATH id="juce_events" path="external\JuceLibraryCode\modules"/>
+        <MODULEPATH id="juce_data_structures" path="external\JuceLibraryCode\modules"/>
+        <MODULEPATH id="juce_core" path="external\JuceLibraryCode\modules"/>
+        <MODULEPATH id="juce_audio_devices" path="external\JuceLibraryCode\modules"/>
+        <MODULEPATH id="juce_audio_basics" path="external\JuceLibraryCode\modules"/>
       </MODULEPATHS>
     </VS2022>
   </EXPORTFORMATS>
@@ -148,13 +149,11 @@
     <MODULE id="juce_graphics" showAllCode="0" useLocalCopy="1"/>
     <MODULES id="juce_gui_basics" showAllCode="0" useLocalCopy="1"/>
   </MODULES>
-  <JUCEOPTIONS JUCE_USE_OGGVORBIS="disabled" JUCE_USE_ANDROID_OPENSLES="0" JUCE_USE_CDREADER="disabled"
-               JUCE_USE_CDBURNER="disabled" JUCE_WASAPI="0" JUCE_WASAPI_EXCLUSIVE="0"
-               JUCE_DIRECTSOUND="0" JUCE_ALSA="0" JUCE_USE_WINRT_MIDI="0" JUCE_ASIO="0"
-               JUCE_JACK="0" JUCE_BELA="0" JUCE_USE_ANDROID_OBOE="0" JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS="0"
-               JUCE_FORCE_DEBUG="0" JUCE_LOG_ASSERTIONS="0" JUCE_CATCH_UNHANDLED_EXCEPTIONS="1"
-               JUCE_ALLOW_STATIC_NULL_VARIABLES="0" JUCE_STRICT_REFCOUNTEDPOINTER="1"
-               JUCE_EXECUTE_APP_SUSPEND_ON_IOS_BACKGROUND_TASK="0"/>
+  <JUCEOPTIONS JUCE_USE_OGGVORBIS="disabled" JUCE_USE_CDREADER="disabled" JUCE_USE_CDBURNER="disabled"
+               JUCE_WASAPI_EXCLUSIVE="0" JUCE_DIRECTSOUND="0" JUCE_ALSA="0"
+               JUCE_USE_ANDROID_OBOE="0" JUCE_CATCH_UNHANDLED_EXCEPTIONS="1"
+               JUCE_STRICT_REFCOUNTEDPOINTER="1" JUCE_EXECUTE_APP_SUSPEND_ON_IOS_BACKGROUND_TASK="0"
+               JUCE_WASAPI="0"/>
   <LIVE_SETTINGS>
     <WINDOWS enableCxx11="1"/>
   </LIVE_SETTINGS>

README.md

@@ -1,4 +1,4 @@
-# MIDI2LR
+# MIDI2LR
 
 [![Latest release](https://img.shields.io/github/release/rsjaffe/MIDI2LR.svg)](https://github.com/rsjaffe/MIDI2LR/releases/latest) [![MIDI2LR All Releases](https://img.shields.io/github/downloads/rsjaffe/MIDI2LR/total.svg)](https://github.com/rsjaffe/MIDI2LR/releases) [![license](https://img.shields.io/github/license/rsjaffe/MIDI2LR.svg)](https://github.com/rsjaffe/MIDI2LR/blob/master/LICENSE.txt)
 
@@ -36,4 +36,6 @@ Translation assistance welcome. Sign up at https://poeditor.com/join/project?has
 
 ## SAST Tools
 
-[PVS-Studio](https://pvs-studio.com/pvs-studio/?utm_source=website&utm_medium=github&utm_campaign=open_source) - static analyzer for C, C++, C#, and Java code.
+[PVS-Studio](https://pvs-studio.com/pvs-studio/?utm_source=website&utm_medium=github&utm_campaign=open_source) - static analyzer for C, C++, C#, and Java code.
+
+[ReSharperC++](https://www.jetbrains.com/resharper-cpp/) - static analyzer for C++ code.

build/MacOS/Info-App.plist

@@ -20,9 +20,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>5.4.0.0</string>
+    <string>6.0.0.0</string>
     <key>CFBundleVersion</key>
-    <string>5.4.0.0</string>
+    <string>6.0.0.0</string>
     <key>NSHumanReadableCopyright</key>
     <string>Copyright (C) 2015 by Rory Jaffe.</string>
     <key>NSHighResolutionCapable</key>