Skip to content

Commit 6634378

Browse files
committed
Fix building on Apple Silicon
1 parent b082153 commit 6634378

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

CircularProgress.xcodeproj/project.pbxproj

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
9F2F370B224E9BD100C71D8E /* CheckmarkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F2F370A224E9BD100C71D8E /* CheckmarkView.swift */; };
1111
B5344AB721F8B27100C12ADB /* CustomButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5344AB621F8B27100C12ADB /* CustomButton.swift */; };
1212
E303038B233786DA00B8ED1F /* CustomButton+Util.swift in Sources */ = {isa = PBXBuildFile; fileRef = E303038A233786DA00B8ED1F /* CustomButton+Util.swift */; };
13-
E327393D2177359E00FFE124 /* util.swift in Sources */ = {isa = PBXBuildFile; fileRef = E327393C2177359E00FFE124 /* util.swift */; };
13+
E327393D2177359E00FFE124 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = E327393C2177359E00FFE124 /* Utilities.swift */; };
1414
E3FB30C420EA5DBC009BA1BD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3FB30C320EA5DBC009BA1BD /* AppDelegate.swift */; };
1515
E3FB30C920EA5DBE009BA1BD /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E3FB30C720EA5DBE009BA1BD /* MainMenu.xib */; };
1616
E3FB30CF20EA5EBD009BA1BD /* CircularProgress.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "CircularProgress::CircularProgress::Product" /* CircularProgress.framework */; };
1717
E3FB30D020EA5EBD009BA1BD /* CircularProgress.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = "CircularProgress::CircularProgress::Product" /* CircularProgress.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1818
OBJ_19 /* CircularProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* CircularProgress.swift */; };
19-
OBJ_20 /* util.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* util.swift */; };
19+
OBJ_20 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* Utilities.swift */; };
2020
OBJ_27 /* Package.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_6 /* Package.swift */; };
2121
/* End PBXBuildFile section */
2222

@@ -49,12 +49,12 @@
4949
B5344AB621F8B27100C12ADB /* CustomButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = CustomButton.swift; sourceTree = "<group>"; usesTabs = 1; };
5050
"CircularProgress::CircularProgress::Product" /* CircularProgress.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CircularProgress.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5151
E303038A233786DA00B8ED1F /* CustomButton+Util.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "CustomButton+Util.swift"; sourceTree = "<group>"; usesTabs = 1; };
52-
E327393C2177359E00FFE124 /* util.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = util.swift; sourceTree = "<group>"; usesTabs = 1; };
52+
E327393C2177359E00FFE124 /* Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Utilities.swift; sourceTree = "<group>"; usesTabs = 1; };
5353
E3FB30C120EA5DBC009BA1BD /* CircularProgressExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CircularProgressExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
5454
E3FB30C320EA5DBC009BA1BD /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AppDelegate.swift; sourceTree = "<group>"; usesTabs = 1; };
5555
E3FB30C820EA5DBE009BA1BD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
5656
E3FB30CA20EA5DBE009BA1BD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
57-
OBJ_10 /* util.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = util.swift; sourceTree = "<group>"; usesTabs = 1; };
57+
OBJ_10 /* Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Utilities.swift; sourceTree = "<group>"; usesTabs = 1; };
5858
OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; fileEncoding = 4; lineEnding = 0; path = Package.swift; sourceTree = "<group>"; usesTabs = 1; };
5959
OBJ_9 /* CircularProgress.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = CircularProgress.swift; sourceTree = "<group>"; usesTabs = 1; };
6060
/* End PBXFileReference section */
@@ -91,7 +91,7 @@
9191
isa = PBXGroup;
9292
children = (
9393
E3FB30C320EA5DBC009BA1BD /* AppDelegate.swift */,
94-
E327393C2177359E00FFE124 /* util.swift */,
94+
E327393C2177359E00FFE124 /* Utilities.swift */,
9595
E3FB30C720EA5DBE009BA1BD /* MainMenu.xib */,
9696
E3FB30CA20EA5DBE009BA1BD /* Info.plist */,
9797
);
@@ -131,7 +131,7 @@
131131
children = (
132132
OBJ_9 /* CircularProgress.swift */,
133133
9F2F370A224E9BD100C71D8E /* CheckmarkView.swift */,
134-
OBJ_10 /* util.swift */,
134+
OBJ_10 /* Utilities.swift */,
135135
E3030389233786B100B8ED1F /* Vendored */,
136136
);
137137
name = CircularProgress;
@@ -268,7 +268,7 @@
268268
buildActionMask = 2147483647;
269269
files = (
270270
E3FB30C420EA5DBC009BA1BD /* AppDelegate.swift in Sources */,
271-
E327393D2177359E00FFE124 /* util.swift in Sources */,
271+
E327393D2177359E00FFE124 /* Utilities.swift in Sources */,
272272
);
273273
runOnlyForDeploymentPostprocessing = 0;
274274
};
@@ -278,7 +278,7 @@
278278
files = (
279279
E303038B233786DA00B8ED1F /* CustomButton+Util.swift in Sources */,
280280
OBJ_19 /* CircularProgress.swift in Sources */,
281-
OBJ_20 /* util.swift in Sources */,
281+
OBJ_20 /* Utilities.swift in Sources */,
282282
9F2F370B224E9BD100C71D8E /* CheckmarkView.swift in Sources */,
283283
B5344AB721F8B27100C12ADB /* CustomButton.swift in Sources */,
284284
);
@@ -527,7 +527,6 @@
527527
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
528528
SWIFT_VERSION = 5.0;
529529
USE_HEADERMAP = NO;
530-
VALID_ARCHS = x86_64;
531530
};
532531
name = Debug;
533532
};
@@ -575,7 +574,6 @@
575574
SWIFT_OPTIMIZATION_LEVEL = "-O";
576575
SWIFT_VERSION = 5.0;
577576
USE_HEADERMAP = NO;
578-
VALID_ARCHS = x86_64;
579577
};
580578
name = Release;
581579
};

Example/util.swift renamed to Example/Utilities.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ extension NSView {
8282
*/
8383
@discardableResult
8484
func insertVibrancyView(
85-
material: NSVisualEffectView.Material = .appearanceBased,
85+
material: NSVisualEffectView.Material,
8686
blendingMode: NSVisualEffectView.BlendingMode = .behindWindow,
8787
appearanceName: NSAppearance.Name? = nil
8888
) -> NSVisualEffectView {

0 commit comments

Comments
 (0)