Merge branch 'main' into muukii/support-hdr

FluidGroup · Jun 7, 2024 · 71a1a7a · 71a1a7a
2 parents 4231864 + 9de661e
commit 71a1a7a
Show file tree

Hide file tree

Showing 56 changed files with 3,688 additions and 1,406 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -4,48 +4,26 @@ on:
   push:
 
 jobs:
-  swiftuidemo:
-    runs-on: macos-12
-
-    steps:
-      - uses: maxim-lobanov/[email protected]
-        with:
-          xcode-version: "14.2"
-      - uses: actions/checkout@v2
-      - name: Build demo app
-        run: xcodebuild -project ./Dev/Brightroom.xcodeproj -scheme SwiftUIDemo -destination 'platform=iOS Simulator,name=iPhone 8,OS=16.2' | xcpretty
-
-  demo:
-    runs-on: macos-12
-
-    steps:
-      - uses: maxim-lobanov/[email protected]
-        with:
-          xcode-version: "14.2"
-      - uses: actions/checkout@v2
-      - name: Build demo app
-        run: xcodebuild -project ./Dev/Brightroom.xcodeproj -scheme Demo -destination 'platform=iOS Simulator,name=iPhone 8,OS=16.2' | xcpretty
-
   test:
-    runs-on: macos-12
+    runs-on: macos-14
 
     steps:
       - uses: maxim-lobanov/[email protected]
         with:
-          xcode-version: "14.2"
+          xcode-version: "15.2"
       - uses: actions/checkout@v2
         with:
           submodules: true
       - name: Test
-        run: xcodebuild -project ./Dev/Brightroom.xcodeproj -scheme BrightroomEngineTests test -destination 'platform=iOS Simulator,name=iPhone 8,OS=16.2' | xcpretty
+        run: set -o pipefail && xcodebuild -project ./Dev/Brightroom.xcodeproj -scheme BrightroomEngineTests test -destination 'platform=iOS Simulator,name=iPhone 15 Pro,OS=17.0.1'  -skipMacroValidation -skipPackagePluginValidation | xcpretty
 
   swiftpm:
-    runs-on: macos-12
+    runs-on: macos-14
 
     steps:
       - uses: maxim-lobanov/[email protected]
         with:
-          xcode-version: "14.2"
+          xcode-version: "15.2"
       - uses: actions/checkout@v2
       - name: Build
-        run: xcodebuild -scheme BrightroomUI -destination 'platform=iOS Simulator,name=iPhone 8,OS=16.2' | xcpretty
+        run: xcodebuild -scheme BrightroomUI -destination 'generic/platform=iOS Simulator'  -skipMacroValidation -skipPackagePluginValidation | xcpretty
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "submodules/muukii/Reveal-SDK"]
+	path = submodules/muukii/Reveal-SDK
+	url = https://github.com/muukii/Reveal-SDK.git
diff --git a/Dev/Brightroom.xcodeproj/project.pbxproj b/Dev/Brightroom.xcodeproj/project.pbxproj
diff --git a/Dev/Brightroom.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Dev/Brightroom.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -36,6 +36,15 @@
         "version" : "0.10.0"
       }
     },
+    {
+      "identity" : "precisionlevelslider",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/FluidGroup/PrecisionLevelSlider",
+      "state" : {
+        "revision" : "3e460c1cea5ec916f7185948bc0a4e093e20f7a5",
+        "version" : "2.1.0"
+      }
+    },
     {
       "identity" : "rxswift",
       "kind" : "remoteSourceControl",
@@ -81,6 +90,24 @@
         "version" : "509.0.2"
       }
     },
+    {
+      "identity" : "swiftui-hosting",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/FluidGroup/swiftui-hosting.git",
+      "state" : {
+        "revision" : "7e8eaca72eae910d6d3b6272c263c6c3a10b755c",
+        "version" : "1.2.0"
+      }
+    },
+    {
+      "identity" : "swiftui-support",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/FluidGroup/swiftui-support.git",
+      "state" : {
+        "revision" : "c610c1e46c14c4660beb4ef7fe0241941dbecdc6",
+        "version" : "0.5.0"
+      }
+    },
     {
       "identity" : "texture",
       "kind" : "remoteSourceControl",
@@ -96,7 +123,7 @@
       "location" : "https://github.com/FluidGroup/TextureSwiftSupport",
       "state" : {
         "branch" : "main",
-        "revision" : "5de10d4c9eae028a8c560ba1c964f76bc8b731c5"
+        "revision" : "5bae50cab3798dccb8b98c3ffbc70320ae66b45a"
       }
     },
     {

diff --git a/Dev/Brightroom.xcodeproj/xcshareddata/xcschemes/BrightroomUI.xcscheme b/Dev/Brightroom.xcodeproj/xcshareddata/xcschemes/BrightroomUI.xcscheme
@@ -14,10 +14,24 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4B47D051216CC5350007B594"
-               BuildableName = "BrightroomUI.framework"
+               BlueprintIdentifier = "BrightroomEngine"
+               BuildableName = "BrightroomEngine"
+               BlueprintName = "BrightroomEngine"
+               ReferencedContainer = "container:..">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BrightroomUI"
+               BuildableName = "BrightroomUI"
                BlueprintName = "BrightroomUI"
-               ReferencedContainer = "container:Brightroom.xcodeproj">
+               ReferencedContainer = "container:..">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -40,15 +54,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4B47D051216CC5350007B594"
-            BuildableName = "BrightroomUI.framework"
-            BlueprintName = "BrightroomUI"
-            ReferencedContainer = "container:Brightroom.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -59,10 +64,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4B47D051216CC5350007B594"
-            BuildableName = "BrightroomUI.framework"
+            BlueprintIdentifier = "BrightroomUI"
+            BuildableName = "BrightroomUI"
             BlueprintName = "BrightroomUI"
-            ReferencedContainer = "container:Brightroom.xcodeproj">
+            ReferencedContainer = "container:..">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/Dev/Sources/Demo/Contents/DemoCropMenuViewController.swift b/Dev/Sources/Demo/Contents/DemoCropMenuViewController.swift
@@ -213,7 +213,7 @@ final class DemoCropMenuViewController: StackScrollNodeViewController {
             cropModifier: .init { image, crop, completion in
 
               var new = crop
-              new.updateCropExtentNormalizing(
+              new.updateCropExtent(
                 CGRect(
                   origin: .zero,
                   size: .init(width: 100, height: 300)

diff --git a/Dev/Sources/SharedForDemo/Mocks.swift b/Dev/Sources/SharedForDemo/Mocks.swift
@@ -27,7 +27,11 @@ enum Mocks {
   static func imageSuperSmall() -> UIImage {
     UIImage(named: "super-small")!
   }
-
+
+  static func imageOrientationLeft() -> UIImage {
+    UIImage(named: "orientation_left.HEIC")!
+  }
+
   static func makeEditingStack(image: UIImage) -> EditingStack {
     .init(
       imageProvider: .init(image: image)