Merge branch 'develop'

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"

.gitignore

@@ -3,8 +3,12 @@
 # macOS specific
 .DS_Store
 
-# Managed by Cocoapods
-Pods/
+# Managed by bundler
+vendor/bundle/
+
+# AppCenter xcframework binaries
+# TODO: There is no automated download method for those yet, consider using Git LFS
+vendor/Frameworks/
 
 # Xcode user
 xcuserdata

Brewfile

@@ -0,0 +1,3 @@
+brew "carthage"
+brew "dpkg"
+cask "jtool"

Brewfile.lock.json

@@ -0,0 +1,47 @@
+{
+  "entries": {
+    "brew": {
+      "dpkg": {
+        "version": "1.20.5",
+        "bottle": {
+          "cellar": "/usr/local/Cellar",
+          "prefix": "/usr/local",
+          "files": {
+            "catalina": {
+              "url": "https://homebrew.bintray.com/bottles/dpkg-1.20.5.catalina.bottle.tar.gz",
+              "sha256": "32ae6083fd4207f4cecd58087b68afc43a22d6020bd7a89184a0af20ecc9a2fb"
+            },
+            "mojave": {
+              "url": "https://homebrew.bintray.com/bottles/dpkg-1.20.5.mojave.bottle.tar.gz",
+              "sha256": "ec0d8e85f436bc6394de1f261c1c0e791ed72797d7ae20e6fb8f1cda016a7b43"
+            },
+            "high_sierra": {
+              "url": "https://homebrew.bintray.com/bottles/dpkg-1.20.5.high_sierra.bottle.tar.gz",
+              "sha256": "483c5e48a18dd401638399670aff9fd1a2800a243a37f208235777e9fc140986"
+            }
+          }
+        }
+      }
+    },
+    "cask": {
+      "jtool2": {
+        "version": "2020.02.10",
+        "options": {
+          "full_name": "jtool2"
+        }
+      }
+    }
+  },
+  "system": {
+    "macos": {
+      "catalina": {
+        "HOMEBREW_VERSION": "2.5.8",
+        "HOMEBREW_PREFIX": "/usr/local",
+        "Homebrew/homebrew-core": "5f653cea908226297af7faab47e8a6f9490d5aca",
+        "CLT": "1103.0.32.29",
+        "Xcode": "12.1",
+        "macOS": "10.15.7"
+      }
+    }
+  }
+}

Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem "xcodeproj"
+gem "xcpretty"

Gemfile.lock

@@ -0,0 +1,27 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.2)
+    atomos (0.1.3)
+    claide (1.0.3)
+    colored2 (3.1.2)
+    nanaimo (0.3.0)
+    rouge (2.0.7)
+    xcodeproj (1.19.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  xcodeproj
+  xcpretty
+
+BUNDLED WITH
+   1.17.2

NXBoot.xcodeproj/xcshareddata/xcschemes/NXBoot.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1030"
+   LastUpgradeVersion = "1210"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:NXBoot.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:NXBoot.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

NXBoot.xcodeproj/xcshareddata/xcschemes/NXBootCmdMac.xcscheme → NXBoot.xcodeproj/xcshareddata/xcschemes/NXBootCmd.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1030"
+   LastUpgradeVersion = "1210"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "A795B6B421015F880008820F"
                BuildableName = "nxboot"
-               BlueprintName = "NXBootCmdMac"
+               BlueprintName = "NXBootCmd_macOS"
                ReferencedContainer = "container:NXBoot.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -29,17 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A795B6B421015F880008820F"
-            BuildableName = "nxboot"
-            BlueprintName = "NXBootCmdMac"
-            ReferencedContainer = "container:NXBoot.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -57,12 +46,10 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "A795B6B421015F880008820F"
             BuildableName = "nxboot"
-            BlueprintName = "NXBootCmdMac"
+            BlueprintName = "NXBootCmd_macOS"
             ReferencedContainer = "container:NXBoot.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -76,7 +63,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "A795B6B421015F880008820F"
             BuildableName = "nxboot"
-            BlueprintName = "NXBootCmdMac"
+            BlueprintName = "NXBootCmd_macOS"
             ReferencedContainer = "container:NXBoot.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>

NXBoot.xcodeproj/xcshareddata/xcschemes/NXBootKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1030"
+   LastUpgradeVersion = "1210"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,8 +15,22 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "A73FDCE220FA9C5C007EBF4F"
-               BuildableName = "libNXBootKit.a"
-               BlueprintName = "NXBootKit"
+               BuildableName = "libNXBootKit_iOS.a"
+               BlueprintName = "NXBootKit_iOS"
+               ReferencedContainer = "container:NXBoot.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A70934D82556DEA0006AA85B"
+               BuildableName = "libNXBootKit_macOS.a"
+               BlueprintName = "NXBootKit_macOS"
                ReferencedContainer = "container:NXBoot.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -29,8 +43,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -42,17 +54,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A73FDCE220FA9C5C007EBF4F"
-            BuildableName = "libNXBootKit.a"
-            BlueprintName = "NXBootKit"
-            ReferencedContainer = "container:NXBoot.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -64,8 +65,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "A73FDCE220FA9C5C007EBF4F"
-            BuildableName = "libNXBootKit.a"
-            BlueprintName = "NXBootKit"
+            BuildableName = "libNXBootKit_iOS.a"
+            BlueprintName = "NXBootKit_iOS"
             ReferencedContainer = "container:NXBoot.xcodeproj">
          </BuildableReference>
       </MacroExpansion>