misc changes

bitgapp · Oct 4, 2021 · 2491e96 · 2491e96
1 parent 02753c5
commit 2491e96
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 116 deletions.
diff --git a/native/app/Source/Constants.swift b/native/app/Source/Constants.swift
@@ -13,8 +13,8 @@ import Version
 struct Constants {
 
   #if DEBUG
-  static let UI_ENDPOINT_URL = URL(string: "http://localhost:8080")!
-//  static let UI_ENDPOINT_URL = URL(string: "https://ui-v1.eqmac.app")!
+//  static let UI_ENDPOINT_URL = URL(string: "http://localhost:8080")!
+  static let UI_ENDPOINT_URL = URL(string: "https://ui-v3.eqmac.app")!
   static let DEBUG = true
   #else
   static let DEBUG = false

diff --git a/native/app/eqMac.xcodeproj/project.pbxproj b/native/app/eqMac.xcodeproj/project.pbxproj
@@ -274,6 +274,14 @@
 			path = User;
 			sourceTree = "<group>";
 		};
+		78AD99102708F1F800B95E9C /* Recovered References */ = {
+			isa = PBXGroup;
+			children = (
+				7810723726112C2B005DB609 /* Security.framework */,
+			);
+			name = "Recovered References";
+			sourceTree = "<group>";
+		};
 		A433E835860EBA2247574C67 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -360,6 +368,7 @@
 				E086AFFD1FCCB8E700CF9F0D /* Products */,
 				A433E835860EBA2247574C67 /* Pods */,
 				E6BAF3EF1807277C1A4360F7 /* Frameworks */,
+				78AD99102708F1F800B95E9C /* Recovered References */,
 			);
 			sourceTree = "<group>";
 		};
@@ -992,7 +1001,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.3.0;
+				CURRENT_PROJECT_VERSION = 1.3.1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -1056,7 +1065,7 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.3.0;
+				CURRENT_PROJECT_VERSION = 1.3.1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = JZA6C97KJA;
 				ENABLE_HARDENED_RUNTIME = YES;

diff --git a/native/driver/Driver.xcodeproj/project.pbxproj b/native/driver/Driver.xcodeproj/project.pbxproj
@@ -436,7 +436,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.3.0;
+				CURRENT_PROJECT_VERSION = 1.3.1;
 				DEAD_CODE_STRIPPING = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
@@ -464,7 +464,7 @@
 					"/Library/Audio/Plug-Ins/HAL/eqMac.driver/Contents/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.3.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CODE_SIGN_FLAGS = "";
@@ -510,7 +510,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 1.3.0;
+				CURRENT_PROJECT_VERSION = 1.3.1;
 				DEAD_CODE_STRIPPING = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
@@ -537,7 +537,7 @@
 					"/Library/Audio/Plug-Ins/HAL/eqMac.driver/Contents/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.3.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac.driver;

diff --git a/native/driver/Driver.xcodeproj/xcshareddata/xcschemes/Driver - Debug.xcscheme b/native/driver/Driver.xcodeproj/xcshareddata/xcschemes/Driver - Debug.xcscheme
@@ -35,18 +35,18 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       debugAsWhichUser = "root"
-      launchStyle = "1"
+      launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <PreActions>
+      <PostActions>
          <ExecutionAction
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "export SUDO_ASKPASS=~/askpass.sh&#10;&#10;# Unload CoreAudio&#10;sudo -A launchctl unload /System/Library/LaunchDaemons/com.apple.audio.coreaudiod.plist&#10;&#10;# Uninstall any new driver leftovers&#10;sudo -A rm -rf /Library/Audio/Plug-Ins/HAL/eqMac.driver/&#10;# Install the new driver&#10;sudo -A cp -f -r &quot;$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME&quot; /Library/Audio/Plug-Ins/HAL/&#10;"
+               scriptText = "export SUDO_ASKPASS=~/askpass.sh&#10;# Uninstall any new driver leftovers&#10;sudo -A rm -rf /Library/Audio/Plug-Ins/HAL/eqMac.driver/&#10;# Install the new driver&#10;sudo -A cp -f -r &quot;$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME&quot; /Library/Audio/Plug-Ins/HAL/&#10;# Restart CoreAudio&#10;sudo -A launchctl kickstart -k system/com.apple.audio.coreaudiod&#10;"
                shellToInvoke = "/bin/sh">
                <EnvironmentBuildable>
                   <BuildableReference
@@ -59,11 +59,7 @@
                </EnvironmentBuildable>
             </ActionContent>
          </ExecutionAction>
-      </PreActions>
-      <PathRunnable
-         runnableDebuggingMode = "0"
-         FilePath = "/usr/sbin/coreaudiod">
-      </PathRunnable>
+      </PostActions>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -80,10 +76,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <PathRunnable
-         runnableDebuggingMode = "0"
-         FilePath = "/usr/sbin/coreaudiod">
-      </PathRunnable>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"

diff --git a/native/driver/Driver.xcodeproj/xcshareddata/xcschemes/Driver - Install (Debug).xcscheme b/native/driver/Driver.xcodeproj/xcshareddata/xcschemes/Driver - Install (Debug).xcscheme