Skip to content

Commit d886c99

Browse files
gcollazogcollazo
committed
updated
1 parent 14f7165 commit d886c99

File tree

6 files changed

+19
-66
lines changed

6 files changed

+19
-66
lines changed

‎MongoDB.xcodeproj/project.pbxproj

+6-40
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
5E0EA03B288BF9550087D89B /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 5E0EA03A288BF9550087D89B /* Sparkle */; };
1110
7D25A7E81A697586007EC13C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D25A7E71A697586007EC13C /* AppDelegate.swift */; };
1211
7D25A7EA1A697586007EC13C /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7D25A7E91A697586007EC13C /* Images.xcassets */; };
1312
7D25A7ED1A697586007EC13C /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D25A7EB1A697586007EC13C /* MainMenu.xib */; };
1413
7D25A7F91A697586007EC13C /* MongoDBTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D25A7F81A697586007EC13C /* MongoDBTests.swift */; };
15-
7D75EF2128A4290D00516513 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 7D75EF2028A4290D00516513 /* Sparkle */; };
14+
7D31FE5F2D6D104100F1CD08 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D31FE5D2D6D103E00F1CD08 /* Sparkle.framework */; };
15+
7D31FE602D6D104100F1CD08 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7D31FE5D2D6D103E00F1CD08 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1616
AAB9CA961F6EDC5900614682 /* Vendor in Copy Files: Vendor/mongodb */ = {isa = PBXBuildFile; fileRef = AAB9CA951F6EDC4500614682 /* Vendor */; };
1717
/* End PBXBuildFile section */
1818

@@ -44,6 +44,7 @@
4444
dstPath = "";
4545
dstSubfolderSpec = 10;
4646
files = (
47+
7D31FE602D6D104100F1CD08 /* Sparkle.framework in CopyFiles */,
4748
);
4849
runOnlyForDeploymentPostprocessing = 0;
4950
};
@@ -58,6 +59,7 @@
5859
7D25A7F21A697586007EC13C /* MongoDBTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MongoDBTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5960
7D25A7F71A697586007EC13C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6061
7D25A7F81A697586007EC13C /* MongoDBTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MongoDBTests.swift; sourceTree = "<group>"; };
62+
7D31FE5D2D6D103E00F1CD08 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
6163
7DBE349E1AAB5A2100AFBE02 /* MongoDB.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = MongoDB.entitlements; sourceTree = "<group>"; };
6264
AAB9CA951F6EDC4500614682 /* Vendor */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Vendor; sourceTree = SOURCE_ROOT; };
6365
/* End PBXFileReference section */
@@ -67,8 +69,7 @@
6769
isa = PBXFrameworksBuildPhase;
6870
buildActionMask = 2147483647;
6971
files = (
70-
5E0EA03B288BF9550087D89B /* Sparkle in Frameworks */,
71-
7D75EF2128A4290D00516513 /* Sparkle in Frameworks */,
72+
7D31FE5F2D6D104100F1CD08 /* Sparkle.framework in Frameworks */,
7273
);
7374
runOnlyForDeploymentPostprocessing = 0;
7475
};
@@ -88,6 +89,7 @@
8889
7D25A7E41A697586007EC13C /* MongoDB */,
8990
7D25A7F51A697586007EC13C /* MongoDBTests */,
9091
7D25A7E31A697586007EC13C /* Products */,
92+
7D31FE5D2D6D103E00F1CD08 /* Sparkle.framework */,
9193
);
9294
indentWidth = 4;
9395
sourceTree = "<group>";
@@ -159,8 +161,6 @@
159161
);
160162
name = MongoDB;
161163
packageProductDependencies = (
162-
5E0EA03A288BF9550087D89B /* Sparkle */,
163-
7D75EF2028A4290D00516513 /* Sparkle */,
164164
);
165165
productName = MongoDB;
166166
productReference = 7D25A7E21A697586007EC13C /* MongoDB.app */;
@@ -223,8 +223,6 @@
223223
);
224224
mainGroup = 7D25A7D91A697586007EC13C;
225225
packageReferences = (
226-
5E0EA039288BF9550087D89B /* XCRemoteSwiftPackageReference "Sparkle" */,
227-
7D75EF1F28A4290D00516513 /* XCRemoteSwiftPackageReference "Sparkle" */,
228226
);
229227
productRefGroup = 7D25A7E31A697586007EC13C /* Products */;
230228
projectDirPath = "";
@@ -530,38 +528,6 @@
530528
defaultConfigurationName = Release;
531529
};
532530
/* End XCConfigurationList section */
533-
534-
/* Begin XCRemoteSwiftPackageReference section */
535-
5E0EA039288BF9550087D89B /* XCRemoteSwiftPackageReference "Sparkle" */ = {
536-
isa = XCRemoteSwiftPackageReference;
537-
repositoryURL = "[email protected]:sparkle-project/Sparkle.git";
538-
requirement = {
539-
kind = upToNextMajorVersion;
540-
minimumVersion = 2.0.0;
541-
};
542-
};
543-
7D75EF1F28A4290D00516513 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
544-
isa = XCRemoteSwiftPackageReference;
545-
repositoryURL = "https://github.com/sparkle-project/Sparkle";
546-
requirement = {
547-
branch = 2.x;
548-
kind = branch;
549-
};
550-
};
551-
/* End XCRemoteSwiftPackageReference section */
552-
553-
/* Begin XCSwiftPackageProductDependency section */
554-
5E0EA03A288BF9550087D89B /* Sparkle */ = {
555-
isa = XCSwiftPackageProductDependency;
556-
package = 5E0EA039288BF9550087D89B /* XCRemoteSwiftPackageReference "Sparkle" */;
557-
productName = Sparkle;
558-
};
559-
7D75EF2028A4290D00516513 /* Sparkle */ = {
560-
isa = XCSwiftPackageProductDependency;
561-
package = 7D75EF1F28A4290D00516513 /* XCRemoteSwiftPackageReference "Sparkle" */;
562-
productName = Sparkle;
563-
};
564-
/* End XCSwiftPackageProductDependency section */
565531
};
566532
rootObject = 7D25A7DA1A697586007EC13C /* Project object */;
567533
}

‎MongoDB.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

-14
This file was deleted.

‎MongoDB/AppDelegate.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
103103
}
104104

105105
@objc func openLogsDirectory(_ send: AnyObject) {
106-
NSWorkspace.shared.openFile(self.logPath)
106+
let logURL = URL(fileURLWithPath: self.logPath)
107+
NSWorkspace.shared.open(logURL)
107108
}
108109

109110
func createDirectories() {

‎MongoDB/Base.lproj/MainMenu.xib

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7531" systemVersion="14D136" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7531"/>
4+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
55
</dependencies>
66
<objects>
77
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -665,6 +665,7 @@
665665
</menu>
666666
</menuItem>
667667
</items>
668+
<point key="canvasLocation" x="108" y="-36"/>
668669
</menu>
669670
<customObject id="ewH-ZR-rzC" customClass="SUUpdater"/>
670671
</objects>

‎MongoDB/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>7.0.3-build.2</string>
20+
<string>8.0.5-build.1</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>7.0.3-build.2</string>
24+
<string>8.0.5-build.1</string>
2525
<key>LSApplicationCategoryType</key>
2626
<string>public.app-category.developer-tools</string>
2727
<key>LSMinimumSystemVersion</key>

‎update.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
set -ef -o pipefail
3+
24

35
# =========================== CHECK FORCE FLAG =================================
46
if [ "$1" == "--force" ]; then
@@ -35,7 +37,7 @@ fi
3537

3638
# =========================== DOWNLOAD =========================================
3739
echo '--> Download'
38-
DOWNLOAD_URL="https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-$VERSION.tgz"
40+
DOWNLOAD_URL="https://fastdl.mongodb.org/osx/mongodb-macos-arm64-$VERSION.tgz"
3941

4042
# Download latest mongodb for mac
4143
echo " -- Downloading: $DOWNLOAD_URL"
@@ -47,23 +49,20 @@ rm -rf "$(pwd)/Vendor/mongodb"
4749

4850
# Create dir
4951
echo " -- Creating directory $(pwd)/Vendor/mongodb"
50-
mkdir -p "$(pwd)/Vendor/mongodb"
52+
mkdir -p "$(pwd)/Vendor"
5153

5254
# Extract
5355
echo " -- Unzipping..."
5456
tar xvzf /tmp/mongodb.tgz -C /tmp
5557

5658
# move files
5759
echo " -- Moving files to $(pwd)/Vendor/mongodb/"
58-
mv /tmp/mongodb-macos-x86_64-*/* Vendor/mongodb
60+
mv "/tmp/mongodb-macos-aarch64-$VERSION/" "$(pwd)/Vendor/mongodb"
5961

6062
# cleanup
6163
echo " -- Removing /tmp/mongodb.tgz"
6264
rm /tmp/mongodb.tgz
6365

64-
echo " -- Removing /tmp/mongodb-macos-x86_64-*"
65-
rm -r /tmp/mongodb-macos-x86_64-*
66-
6766
echo " -- Download completed!"
6867

6968

0 commit comments

Comments
 (0)