Skip to content

Commit d9a1a33

Browse files
committed
Updating project to be M1 (ARM) compatible
1 parent 3a8e543 commit d9a1a33

File tree

3 files changed

+125
-87
lines changed

3 files changed

+125
-87
lines changed

OpenHaystack/OpenHaystack.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@
796796
DEVELOPMENT_TEAM = "";
797797
ENABLE_HARDENED_RUNTIME = NO;
798798
ENABLE_PREVIEWS = YES;
799-
EXCLUDED_ARCHS = "arm64e arm64";
799+
EXCLUDED_ARCHS = "";
800800
INFOPLIST_FILE = OpenHaystack/Info.plist;
801801
LD_RUNPATH_SEARCH_PATHS = (
802802
"$(inherited)",
@@ -823,7 +823,7 @@
823823
DEVELOPMENT_TEAM = "";
824824
ENABLE_HARDENED_RUNTIME = NO;
825825
ENABLE_PREVIEWS = YES;
826-
EXCLUDED_ARCHS = "arm64e arm64";
826+
EXCLUDED_ARCHS = "";
827827
INFOPLIST_FILE = OpenHaystack/Info.plist;
828828
LD_RUNPATH_SEARCH_PATHS = (
829829
"$(inherited)",

OpenHaystack/OpenHaystack/HaystackApp/Model/PreviewData.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import Foundation
1111
import SwiftUI
12+
import CoreLocation
1213

1314
// swiftlint:disable force_try
1415
struct PreviewData {

OpenHaystack/OpenHaystackMail/Info.plist

Lines changed: 122 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -22,90 +22,127 @@
2222
<string>Copyright © 2021 SEEMOO – TU Darmstadt</string>
2323
<key>NSPrincipalClass</key>
2424
<string>OpenHaystackPluginService</string>
25-
<key>Supported10.14PluginCompatibilityUUIDs</key>
26-
<array>
27-
<string># UUIDs for versions from 10.12 to 99.99.99</string>
28-
<string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
29-
<string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
30-
<string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
31-
<string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
32-
<string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
33-
<string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
34-
<string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
35-
<string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
36-
<string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
37-
<string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
38-
<string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
39-
<string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
40-
<string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
41-
<string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
42-
</array>
43-
<key>Supported10.15PluginCompatibilityUUIDs</key>
44-
<array>
45-
<string># UUIDs for versions from 10.12 to 99.99.99</string>
46-
<string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
47-
<string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
48-
<string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
49-
<string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
50-
<string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
51-
<string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
52-
<string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
53-
<string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
54-
<string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
55-
<string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
56-
<string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
57-
<string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
58-
<string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
59-
<string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
60-
</array>
61-
<key>Supported11.0PluginCompatibilityUUIDs</key>
62-
<array>
63-
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
64-
</array>
65-
<key>Supported11.10PluginCompatibilityUUIDs</key>
66-
<array>
67-
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
68-
</array>
69-
<key>Supported11.1PluginCompatibilityUUIDs</key>
70-
<array>
71-
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
72-
</array>
73-
<key>Supported11.2PluginCompatibilityUUIDs</key>
74-
<array>
75-
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
76-
</array>
77-
<key>Supported11.3PluginCompatibilityUUIDs</key>
78-
<array>
79-
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
80-
</array>
81-
<key>Supported11.4PluginCompatibilityUUIDs</key>
82-
<array>
83-
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
84-
</array>
85-
<key>Supported11.5PluginCompatibilityUUIDs</key>
86-
<array>
87-
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
88-
</array>
89-
<key>Supported11.6PluginCompatibilityUUIDs</key>
90-
<array>
91-
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
92-
</array>
93-
<key>Supported11.7PluginCompatibilityUUIDs</key>
94-
<array>
95-
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
96-
</array>
97-
<key>Supported11.8PluginCompatibilityUUIDs</key>
98-
<array>
99-
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
100-
</array>
101-
<key>Supported11.9PluginCompatibilityUUIDs</key>
102-
<array>
103-
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
104-
</array>
105-
<key>Supported12.0PluginCompatibilityUUIDs</key>
106-
<array>
107-
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
108-
<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
109-
</array>
25+
<key>Supported10.14PluginCompatibilityUUIDs</key>
26+
<array>
27+
<string># UUIDs for versions from 10.12 to 99.99.99</string>
28+
<string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
29+
<string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
30+
<string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
31+
<string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
32+
<string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
33+
<string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
34+
<string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
35+
<string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
36+
<string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
37+
<string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
38+
<string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
39+
<string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
40+
<string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
41+
<string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
42+
</array>
43+
<key>Supported10.15PluginCompatibilityUUIDs</key>
44+
<array>
45+
<string># UUIDs for versions from 10.12 to 99.99.99</string>
46+
<string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
47+
<string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
48+
<string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
49+
<string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
50+
<string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
51+
<string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
52+
<string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
53+
<string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
54+
<string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
55+
<string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
56+
<string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
57+
<string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
58+
<string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
59+
<string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
60+
</array>
61+
<key>Supported11.0PluginCompatibilityUUIDs</key>
62+
<array>
63+
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
64+
</array>
65+
<key>Supported11.10PluginCompatibilityUUIDs</key>
66+
<array>
67+
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
68+
</array>
69+
<key>Supported11.1PluginCompatibilityUUIDs</key>
70+
<array>
71+
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
72+
</array>
73+
<key>Supported11.2PluginCompatibilityUUIDs</key>
74+
<array>
75+
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
76+
</array>
77+
<key>Supported11.3PluginCompatibilityUUIDs</key>
78+
<array>
79+
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
80+
</array>
81+
<key>Supported11.4PluginCompatibilityUUIDs</key>
82+
<array>
83+
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
84+
</array>
85+
<key>Supported11.5PluginCompatibilityUUIDs</key>
86+
<array>
87+
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
88+
</array>
89+
<key>Supported11.6PluginCompatibilityUUIDs</key>
90+
<array>
91+
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
92+
</array>
93+
<key>Supported11.7PluginCompatibilityUUIDs</key>
94+
<array>
95+
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
96+
</array>
97+
<key>Supported11.8PluginCompatibilityUUIDs</key>
98+
<array>
99+
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
100+
</array>
101+
<key>Supported11.9PluginCompatibilityUUIDs</key>
102+
<array>
103+
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
104+
</array>
105+
<key>Supported12.0PluginCompatibilityUUIDs</key>
106+
<array>
107+
<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
108+
<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
109+
<string>224E7F96-2099-499C-A501-63FB68C79CD2</string>
110+
</array>
111+
<key>Supported12.1PluginCompatibilityUUIDs</key>
112+
<array>
113+
<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
114+
</array>
115+
<key>Supported12.2PluginCompatibilityUUIDs</key>
116+
<array>
117+
<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
118+
</array>
119+
<key>Supported12.3PluginCompatibilityUUIDs</key>
120+
<array>
121+
<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
122+
</array>
123+
<key>Supported12.4PluginCompatibilityUUIDs</key>
124+
<array>
125+
<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
126+
</array>
127+
<key>Supported12.5PluginCompatibilityUUIDs</key>
128+
<array>
129+
<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
130+
</array>
131+
<key>Supported12.6PluginCompatibilityUUIDs</key>
132+
<array>
133+
<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
134+
</array>
135+
<key>Supported12.7PluginCompatibilityUUIDs</key>
136+
<array>
137+
<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
138+
</array>
139+
<key>Supported12.8PluginCompatibilityUUIDs</key>
140+
<array>
141+
<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
142+
</array>
143+
<key>Supported12.9PluginCompatibilityUUIDs</key>
144+
<array>
145+
<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
146+
</array>
110147
</dict>
111148
</plist>

0 commit comments

Comments
 (0)