Merge pull request #113 from sudara/juce8

Update to JUCE 8 and update dependencies
sudara · Sep 26, 2024 · 622498f · 622498f
2 parents e169995 + 135d714
commit 622498f
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 240 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -105,7 +105,7 @@ jobs:
           submodules: true # Get JUCE populated
 
       - name: Cache the build
-        uses: mozilla-actions/[email protected].4
+        uses: mozilla-actions/[email protected].5
 
       - name: Import Certificates (macOS)
         uses: apple-actions/import-codesign-certs@v3
@@ -209,7 +209,7 @@ jobs:
 
       - name: Codesign with Azure Trusted Signing
         if: ${{ matrix.name == 'Windows' }}
-        uses: azure/trusted-signing-action@v0.3.18
+        uses: azure/trusted-signing-action@v0.4.0
         with:
           # The Azure Active Directory tenant (directory) ID.
           azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}

diff --git a/JUCE b/JUCE
diff --git a/README.md b/README.md
diff --git a/benchmarks/Benchmarks.cpp b/benchmarks/Benchmarks.cpp
@@ -7,15 +7,13 @@ TEST_CASE ("Boot performance")
     BENCHMARK_ADVANCED ("Processor constructor")
     (Catch::Benchmark::Chronometer meter)
     {
-        auto gui = juce::ScopedJuceInitialiser_GUI {};
         std::vector<Catch::Benchmark::storage_for<PluginProcessor>> storage (size_t (meter.runs()));
         meter.measure ([&] (int i) { storage[(size_t) i].construct(); });
     };
 
     BENCHMARK_ADVANCED ("Processor destructor")
     (Catch::Benchmark::Chronometer meter)
     {
-        auto gui = juce::ScopedJuceInitialiser_GUI {};
         std::vector<Catch::Benchmark::destructable_object<PluginProcessor>> storage (size_t (meter.runs()));
         for (auto& s : storage)
             s.construct();
@@ -25,8 +23,6 @@ TEST_CASE ("Boot performance")
     BENCHMARK_ADVANCED ("Editor open and close")
     (Catch::Benchmark::Chronometer meter)
     {
-        auto gui = juce::ScopedJuceInitialiser_GUI {};
-
         PluginProcessor plugin;
 
         // due to complex construction logic of the editor, let's measure open/close together

diff --git a/benchmarks/Catch2Main.cpp b/benchmarks/Catch2Main.cpp
@@ -0,0 +1,17 @@
+// All test files are included in the executable via the Glob in CMakeLists.txt
+
+#include "juce_gui_basics/juce_gui_basics.h"
+#include <catch2/catch_session.hpp>
+
+int main (int argc, char* argv[])
+{
+    // This lets us use JUCE's MessageManager without leaking.
+    // PluginProcessor might need this if you use the APVTS for example.
+    // You'll also need it for tests that rely on juce::Graphics, juce::Timer, etc.
+    // It's nicer DX when placed here vs. manually in Catch2 SECTIONs
+    juce::ScopedJuceInitialiser_GUI gui;
+
+    const int result = Catch::Session().run (argc, argv);
+
+    return result;
+}
diff --git a/cmake b/cmake
diff --git a/modules/melatonin_inspector b/modules/melatonin_inspector
diff --git a/tests/Catch2Main.cpp b/tests/Catch2Main.cpp
@@ -0,0 +1,18 @@
+// All test files are included in the executable via the Glob in CMakeLists.txt
+
+#include "juce_gui_basics/juce_gui_basics.h"
+#include <catch2/catch_session.hpp>
+
+int main (int argc, char* argv[])
+{
+    // This lets us use JUCE's MessageManager without leaking.
+    // PluginProcessor might need this if you use the APVTS for example.
+    // You'll also need it for tests that rely on juce::Graphics, juce::Timer, etc.
+    // It's nicer DX when placed here vs. manually in Catch2 SECTIONs
+    juce::ScopedJuceInitialiser_GUI gui;
+
+    const int result = Catch::Session().run (argc, argv);
+
+    return result;
+}
+#include <catch2/catch_test_macros.hpp>
diff --git a/tests/PluginBasics.cpp b/tests/PluginBasics.cpp
@@ -12,11 +12,6 @@ TEST_CASE ("Plugin instance", "[instance]")
 {
     PluginProcessor testPlugin;
 
-    // This lets us use JUCE's MessageManager without leaking.
-    // PluginProcessor might need this if you use the APVTS for example.
-    // You'll also need it for tests that rely on juce::Graphics, juce::Timer, etc.
-    auto gui = juce::ScopedJuceInitialiser_GUI {};
-
     SECTION ("name")
     {
         CHECK_THAT (testPlugin.getName().toStdString(),

diff --git a/tests/helpers/test_helpers.h b/tests/helpers/test_helpers.h
@@ -19,11 +19,10 @@
    });
 
  */
-[[maybe_unused]] void runWithinPluginEditor (const std::function<void (PluginProcessor& plugin)>& testCode)
+[[maybe_unused]] static void runWithinPluginEditor (const std::function<void (PluginProcessor& plugin)>& testCode)
 {
     PluginProcessor plugin;
-    auto gui = juce::ScopedJuceInitialiser_GUI {};
-    auto editor = plugin.createEditorIfNeeded();
+    const auto editor = plugin.createEditorIfNeeded();
 
     testCode (plugin);
+2 −2		Benchmarks.cmake
+12 −0		CHANGELOG.md
+1 −1		PamplejuceMacOS.cmake
+6 −2		PamplejuceVersion.cmake
+2 −2		Tests.cmake
+34 −5		.github/workflows/ci.yml
+31 −10		CMakeLists.txt
+0 −4		melatonin/component_model.h
+1 −5		melatonin/components/collapsable_panel.h
+3 −15		melatonin/components/color_picker.h
+1 −5		melatonin/components/component_tree_view_item.h
+1 −5		melatonin/components/preview.h
+1 −5		melatonin/inspector_component.h
+23 −6		melatonin/lookandfeel.h
+19 −7		melatonin_inspector.h