From 7ed366c44b5dd9eabe51f5bd387d6aeb092b4884 Mon Sep 17 00:00:00 2001 From: Donald Guy Date: Mon, 2 Aug 2021 17:40:31 -0400 Subject: [PATCH] Changes to build on M1 --- Podfile.lock | 4 ++-- Uebersicht.xcodeproj/project.pbxproj | 2 +- server/package-lock.json | 15 ++++++++------- server/package.json | 2 +- server/release/package-lock.json | 15 ++++++++------- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 3ee613cd..6d36ef69 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -7,7 +7,7 @@ DEPENDENCIES: - Sparkle SPEC REPOS: - https://github.com/cocoapods/specs.git: + trunk: - SocketRocket - Sparkle @@ -17,4 +17,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: f68839bf85fc3a629cc21d58a289a00e2eaaa792 -COCOAPODS: 1.7.5 +COCOAPODS: 1.10.2 diff --git a/Uebersicht.xcodeproj/project.pbxproj b/Uebersicht.xcodeproj/project.pbxproj index afa37b98..24852a90 100644 --- a/Uebersicht.xcodeproj/project.pbxproj +++ b/Uebersicht.xcodeproj/project.pbxproj @@ -555,7 +555,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export PATH=$PATH:/usr/local/bin\ncd server && npm run-script release\n"; + shellScript = "export PATH=$PATH:/usr/local/bin:/opt/homebrew/bin\ncd server && npm run-script release\n"; }; DC92346F23015178009D9E2F /* Run Script */ = { isa = PBXShellScriptBuildPhase; diff --git a/server/package-lock.json b/server/package-lock.json index 726a0382..7641d014 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -26,7 +26,7 @@ "emotion": "^10.0.27", "escodegen": "^1.14.3", "esprima": "^2.7.3", - "fsevents": "^2.1.3", + "fsevents": "^2.3", "jquery": "^3.5.1", "minimist": "^1.2.5", "ms": "^2.0.0", @@ -3058,9 +3058,10 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "node_modules/fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "hasInstallScript": true, "os": [ "darwin" ], @@ -9416,9 +9417,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==" + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==" }, "function-bind": { "version": "1.1.1", diff --git a/server/package.json b/server/package.json index 0dc9ee48..3112085b 100644 --- a/server/package.json +++ b/server/package.json @@ -41,7 +41,7 @@ "emotion": "^10.0.27", "escodegen": "^1.14.3", "esprima": "^2.7.3", - "fsevents": "^2.1.3", + "fsevents": "^2.3", "jquery": "^3.5.1", "minimist": "^1.2.5", "ms": "^2.0.0", diff --git a/server/release/package-lock.json b/server/release/package-lock.json index ec69cb46..33f3190f 100644 --- a/server/release/package-lock.json +++ b/server/release/package-lock.json @@ -26,7 +26,7 @@ "emotion": "^10.0.27", "escodegen": "^1.14.3", "esprima": "^2.7.3", - "fsevents": "^2.1.3", + "fsevents": "^2.3", "jquery": "^3.5.1", "minimist": "^1.2.5", "ms": "^2.0.0", @@ -2947,9 +2947,10 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "node_modules/fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "hasInstallScript": true, "os": [ "darwin" ], @@ -9129,9 +9130,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==" + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==" }, "function-bind": { "version": "1.1.1",