Skip to content

Commit cc50d79

Browse files
vveerrggclaude
vveerrgg
and
claude
committed
fix: prep macOS Safari extension for App Store resubmission
Fix #if macOS → #if os(macOS) so window sizing applies correctly, bump MARKETING_VERSION to 1.5.5, update GitHub org URL, and remove 8 unreachable legacy views/resources from the Xcode project. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 918ea14 commit cc50d79

11 files changed

Lines changed: 10 additions & 516 deletions

File tree

‎apple/NostrKey.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,8 @@
99
/* Begin PBXBuildFile section */
1010
941B03CE296FA90400CA291E /* NostrKey Extension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 941B03CD296FA90400CA291E /* NostrKey Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
1111
941B03D8296FA90400CA291E /* NostrKey Extension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 941B03D7296FA90400CA291E /* NostrKey Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
12-
941B03DE296FA90400CA291E /* Main.html in Resources */ = {isa = PBXBuildFile; fileRef = 941B0399296FA90300CA291E /* Main.html */; };
13-
941B03DF296FA90400CA291E /* Main.html in Resources */ = {isa = PBXBuildFile; fileRef = 941B0399296FA90300CA291E /* Main.html */; };
1412
941B03E0296FA90400CA291E /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 941B039B296FA90300CA291E /* Icon.png */; };
1513
941B03E1296FA90400CA291E /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 941B039B296FA90300CA291E /* Icon.png */; };
16-
941B03E2296FA90400CA291E /* Style.css in Resources */ = {isa = PBXBuildFile; fileRef = 941B039C296FA90300CA291E /* Style.css */; };
17-
941B03E3296FA90400CA291E /* Style.css in Resources */ = {isa = PBXBuildFile; fileRef = 941B039C296FA90300CA291E /* Style.css */; };
18-
941B03E4296FA90400CA291E /* Script.js in Resources */ = {isa = PBXBuildFile; fileRef = 941B039D296FA90300CA291E /* Script.js */; };
19-
941B03E5296FA90400CA291E /* Script.js in Resources */ = {isa = PBXBuildFile; fileRef = 941B039D296FA90300CA291E /* Script.js */; };
20-
941B03E6296FA90400CA291E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 941B039E296FA90300CA291E /* ViewController.swift */; };
21-
941B03E7296FA90400CA291E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 941B039E296FA90300CA291E /* ViewController.swift */; };
2214
941B03E8296FA90400CA291E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 941B039F296FA90400CA291E /* Assets.xcassets */; };
2315
941B03E9296FA90400CA291E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 941B039F296FA90400CA291E /* Assets.xcassets */; };
2416
941B03EA296FA90400CA291E /* SafariWebExtensionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 941B03A1296FA90400CA291E /* SafariWebExtensionHandler.swift */; };
@@ -79,12 +71,6 @@
7971
944A6E40299F46D30032C2E3 /* NostrKeyApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944A6E3E299F46D30032C2E3 /* NostrKeyApp.swift */; };
8072
944A6E4329A081950032C2E3 /* PrivacyPolicyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944A6E4229A081950032C2E3 /* PrivacyPolicyView.swift */; };
8173
944A6E4429A081950032C2E3 /* PrivacyPolicyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944A6E4229A081950032C2E3 /* PrivacyPolicyView.swift */; };
82-
944A6E4629A11C3A0032C2E3 /* GettingStartiPhone.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944A6E4529A11C3A0032C2E3 /* GettingStartiPhone.swift */; };
83-
944A6E4729A11C3A0032C2E3 /* GettingStartiPhone.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944A6E4529A11C3A0032C2E3 /* GettingStartiPhone.swift */; };
84-
944A6E4929A11C640032C2E3 /* GettingStartediPad.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944A6E4829A11C640032C2E3 /* GettingStartediPad.swift */; };
85-
944A6E4A29A11C640032C2E3 /* GettingStartediPad.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944A6E4829A11C640032C2E3 /* GettingStartediPad.swift */; };
86-
944A6E4C29A11C770032C2E3 /* GettingStartedmacOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944A6E4B29A11C770032C2E3 /* GettingStartedmacOS.swift */; };
87-
944A6E4D29A11C770032C2E3 /* GettingStartedmacOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944A6E4B29A11C770032C2E3 /* GettingStartedmacOS.swift */; };
8874
9471E91F29A470C700EA623B /* event_history in Resources */ = {isa = PBXBuildFile; fileRef = 9471E91E29A470C700EA623B /* event_history */; };
8975
9471E92029A470C700EA623B /* event_history in Resources */ = {isa = PBXBuildFile; fileRef = 9471E91E29A470C700EA623B /* event_history */; };
9076
948C69D9297F887600FB3574 /* options.html in Resources */ = {isa = PBXBuildFile; fileRef = 948C69D8297F887600FB3574 /* options.html */; };
@@ -99,8 +85,6 @@
9985
948C69E6297F8BA600FB3574 /* options.build.css in Resources */ = {isa = PBXBuildFile; fileRef = 948C69E4297F8BA600FB3574 /* options.build.css */; };
10086
948C69E82982DFE900FB3574 /* background.html in Resources */ = {isa = PBXBuildFile; fileRef = 948C69E72982DFE900FB3574 /* background.html */; };
10187
948C69E92982DFE900FB3574 /* background.html in Resources */ = {isa = PBXBuildFile; fileRef = 948C69E72982DFE900FB3574 /* background.html */; };
102-
94AD34CD29A32458008BFFF4 /* TipsAndTricks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AD34CC29A32458008BFFF4 /* TipsAndTricks.swift */; };
103-
94AD34CE29A32458008BFFF4 /* TipsAndTricks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AD34CC29A32458008BFFF4 /* TipsAndTricks.swift */; };
10488
A1000001000000000000000A /* full_settings.html in Resources */ = {isa = PBXBuildFile; fileRef = A1000001000000000000000F /* full_settings.html */; };
10589
A1000001000000000000000B /* full_settings.html in Resources */ = {isa = PBXBuildFile; fileRef = A1000001000000000000000F /* full_settings.html */; };
10690
A1000002000000000000000A /* sidepanel.build.js in Resources */ = {isa = PBXBuildFile; fileRef = A10000020000000000000010 /* sidepanel.build.js */; };
@@ -162,11 +146,7 @@
162146
/* End PBXCopyFilesBuildPhase section */
163147

164148
/* Begin PBXFileReference section */
165-
941B039A296FA90300CA291E /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = Base; path = ../Base.lproj/Main.html; sourceTree = "<group>"; };
166149
941B039B296FA90300CA291E /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
167-
941B039C296FA90300CA291E /* Style.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = Style.css; sourceTree = "<group>"; };
168-
941B039D296FA90300CA291E /* Script.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = Script.js; sourceTree = "<group>"; };
169-
941B039E296FA90300CA291E /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
170150
941B039F296FA90400CA291E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
171151
941B03A1296FA90400CA291E /* SafariWebExtensionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariWebExtensionHandler.swift; sourceTree = "<group>"; };
172152
941B03A3296FA90400CA291E /* _locales */ = {isa = PBXFileReference; lastKnownFileType = folder; path = _locales; sourceTree = "<group>"; };
@@ -208,17 +188,13 @@
208188
944A6E38299F46270032C2E3 /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
209189
944A6E3E299F46D30032C2E3 /* NostrKeyApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NostrKeyApp.swift; sourceTree = "<group>"; };
210190
944A6E4229A081950032C2E3 /* PrivacyPolicyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyPolicyView.swift; sourceTree = "<group>"; };
211-
944A6E4529A11C3A0032C2E3 /* GettingStartiPhone.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GettingStartiPhone.swift; sourceTree = "<group>"; };
212-
944A6E4829A11C640032C2E3 /* GettingStartediPad.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GettingStartediPad.swift; sourceTree = "<group>"; };
213-
944A6E4B29A11C770032C2E3 /* GettingStartedmacOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GettingStartedmacOS.swift; sourceTree = "<group>"; };
214191
9471E91E29A470C700EA623B /* event_history */ = {isa = PBXFileReference; lastKnownFileType = folder; path = event_history; sourceTree = "<group>"; };
215192
948C69D8297F887600FB3574 /* options.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = options.html; sourceTree = "<group>"; };
216193
948C69DB297F88A200FB3574 /* options.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = options.css; sourceTree = "<group>"; };
217194
948C69DC297F88A200FB3574 /* options.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = options.js; sourceTree = "<group>"; };
218195
948C69E1297F891F00FB3574 /* options.build.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = options.build.js; sourceTree = "<group>"; };
219196
948C69E4297F8BA600FB3574 /* options.build.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = options.build.css; sourceTree = "<group>"; };
220197
948C69E72982DFE900FB3574 /* background.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = background.html; sourceTree = "<group>"; };
221-
94AD34CC29A32458008BFFF4 /* TipsAndTricks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipsAndTricks.swift; sourceTree = "<group>"; };
222198
A1000001000000000000000F /* full_settings.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = full_settings.html; sourceTree = "<group>"; };
223199
A10000020000000000000010 /* sidepanel.build.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = sidepanel.build.js; sourceTree = "<group>"; };
224200
A10000030000000000000011 /* sidepanel.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = sidepanel.html; sourceTree = "<group>"; };
@@ -277,16 +253,11 @@
277253
941B0397296FA90300CA291E /* Shared (App) */ = {
278254
isa = PBXGroup;
279255
children = (
280-
941B039E296FA90300CA291E /* ViewController.swift */,
281256
941B039F296FA90400CA291E /* Assets.xcassets */,
282257
941B0398296FA90300CA291E /* Resources */,
283258
944A6E38299F46270032C2E3 /* MainView.swift */,
284259
944A6E3E299F46D30032C2E3 /* NostrKeyApp.swift */,
285260
944A6E4229A081950032C2E3 /* PrivacyPolicyView.swift */,
286-
944A6E4529A11C3A0032C2E3 /* GettingStartiPhone.swift */,
287-
944A6E4829A11C640032C2E3 /* GettingStartediPad.swift */,
288-
944A6E4B29A11C770032C2E3 /* GettingStartedmacOS.swift */,
289-
94AD34CC29A32458008BFFF4 /* TipsAndTricks.swift */,
290261
);
291262
path = "Shared (App)";
292263
sourceTree = "<group>";
@@ -295,10 +266,7 @@
295266
isa = PBXGroup;
296267
children = (
297268
941B041E2977A1E500CA291E /* icons */,
298-
941B0399296FA90300CA291E /* Main.html */,
299269
941B039B296FA90300CA291E /* Icon.png */,
300-
941B039C296FA90300CA291E /* Style.css */,
301-
941B039D296FA90300CA291E /* Script.js */,
302270
);
303271
path = Resources;
304272
sourceTree = "<group>";
@@ -539,10 +507,7 @@
539507
files = (
540508
941B03E0296FA90400CA291E /* Icon.png in Resources */,
541509
944A6E03299F2FBB0032C2E3 /* experimental in Resources */,
542-
941B03DE296FA90400CA291E /* Main.html in Resources */,
543-
941B03E4296FA90400CA291E /* Script.js in Resources */,
544510
941B03E8296FA90400CA291E /* Assets.xcassets in Resources */,
545-
941B03E2296FA90400CA291E /* Style.css in Resources */,
546511
944A6E13299F39D30032C2E3 /* permission in Resources */,
547512
);
548513
runOnlyForDeploymentPostprocessing = 0;
@@ -552,12 +517,9 @@
552517
buildActionMask = 2147483647;
553518
files = (
554519
941B03E1296FA90400CA291E /* Icon.png in Resources */,
555-
941B03E3296FA90400CA291E /* Style.css in Resources */,
556-
941B03E5296FA90400CA291E /* Script.js in Resources */,
557520
944A6E14299F39D30032C2E3 /* permission in Resources */,
558521
941B03E9296FA90400CA291E /* Assets.xcassets in Resources */,
559522
944A6E04299F2FBB0032C2E3 /* experimental in Resources */,
560-
941B03DF296FA90400CA291E /* Main.html in Resources */,
561523
);
562524
runOnlyForDeploymentPostprocessing = 0;
563525
};
@@ -655,13 +617,8 @@
655617
buildActionMask = 2147483647;
656618
files = (
657619
944A6E3F299F46D30032C2E3 /* NostrKeyApp.swift in Sources */,
658-
944A6E4629A11C3A0032C2E3 /* GettingStartiPhone.swift in Sources */,
659-
94AD34CD29A32458008BFFF4 /* TipsAndTricks.swift in Sources */,
660-
944A6E4C29A11C770032C2E3 /* GettingStartedmacOS.swift in Sources */,
661-
941B03E6296FA90400CA291E /* ViewController.swift in Sources */,
662620
944A6E4329A081950032C2E3 /* PrivacyPolicyView.swift in Sources */,
663621
944A6E39299F46270032C2E3 /* MainView.swift in Sources */,
664-
944A6E4929A11C640032C2E3 /* GettingStartediPad.swift in Sources */,
665622
);
666623
runOnlyForDeploymentPostprocessing = 0;
667624
};
@@ -671,11 +628,6 @@
671628
files = (
672629
944A6E3A299F46270032C2E3 /* MainView.swift in Sources */,
673630
944A6E40299F46D30032C2E3 /* NostrKeyApp.swift in Sources */,
674-
94AD34CE29A32458008BFFF4 /* TipsAndTricks.swift in Sources */,
675-
944A6E4729A11C3A0032C2E3 /* GettingStartiPhone.swift in Sources */,
676-
941B03E7296FA90400CA291E /* ViewController.swift in Sources */,
677-
944A6E4D29A11C770032C2E3 /* GettingStartedmacOS.swift in Sources */,
678-
944A6E4A29A11C640032C2E3 /* GettingStartediPad.swift in Sources */,
679631
944A6E4429A081950032C2E3 /* PrivacyPolicyView.swift in Sources */,
680632
);
681633
runOnlyForDeploymentPostprocessing = 0;
@@ -715,16 +667,6 @@
715667
};
716668
/* End PBXTargetDependency section */
717669

718-
/* Begin PBXVariantGroup section */
719-
941B0399296FA90300CA291E /* Main.html */ = {
720-
isa = PBXVariantGroup;
721-
children = (
722-
941B039A296FA90300CA291E /* Base */,
723-
);
724-
name = Main.html;
725-
sourceTree = "<group>";
726-
};
727-
/* End PBXVariantGroup section */
728670

729671
/* Begin XCBuildConfiguration section */
730672
941B03FC296FA90400CA291E /* Debug */ = {
@@ -862,7 +804,7 @@
862804
"@executable_path/Frameworks",
863805
"@executable_path/../../Frameworks",
864806
);
865-
MARKETING_VERSION = 1.5.4;
807+
MARKETING_VERSION = 1.5.5;
866808
OTHER_LDFLAGS = (
867809
"-framework",
868810
SafariServices,
@@ -893,7 +835,7 @@
893835
"@executable_path/Frameworks",
894836
"@executable_path/../../Frameworks",
895837
);
896-
MARKETING_VERSION = 1.5.4;
838+
MARKETING_VERSION = 1.5.5;
897839
OTHER_LDFLAGS = (
898840
"-framework",
899841
SafariServices,
@@ -934,7 +876,7 @@
934876
"$(inherited)",
935877
"@executable_path/Frameworks",
936878
);
937-
MARKETING_VERSION = 1.5.4;
879+
MARKETING_VERSION = 1.5.5;
938880
OTHER_LDFLAGS = (
939881
"-framework",
940882
SafariServices,
@@ -978,7 +920,7 @@
978920
"$(inherited)",
979921
"@executable_path/Frameworks",
980922
);
981-
MARKETING_VERSION = 1.5.4;
923+
MARKETING_VERSION = 1.5.5;
982924
OTHER_LDFLAGS = (
983925
"-framework",
984926
SafariServices,
@@ -1018,7 +960,7 @@
1018960
"@executable_path/../../../../Frameworks",
1019961
);
1020962
MACOSX_DEPLOYMENT_TARGET = 11.0;
1021-
MARKETING_VERSION = 1.5.4;
963+
MARKETING_VERSION = 1.5.5;
1022964
OTHER_LDFLAGS = (
1023965
"-framework",
1024966
SafariServices,
@@ -1052,7 +994,7 @@
1052994
"@executable_path/../../../../Frameworks",
1053995
);
1054996
MACOSX_DEPLOYMENT_TARGET = 11.0;
1055-
MARKETING_VERSION = 1.5.4;
997+
MARKETING_VERSION = 1.5.5;
1056998
OTHER_LDFLAGS = (
1057999
"-framework",
10581000
SafariServices,
@@ -1100,7 +1042,7 @@
11001042
"@executable_path/../Frameworks",
11011043
);
11021044
MACOSX_DEPLOYMENT_TARGET = 13.5;
1103-
MARKETING_VERSION = 1.5.4;
1045+
MARKETING_VERSION = 1.5.5;
11041046
OTHER_LDFLAGS = (
11051047
"-framework",
11061048
SafariServices,
@@ -1149,7 +1091,7 @@
11491091
"@executable_path/../Frameworks",
11501092
);
11511093
MACOSX_DEPLOYMENT_TARGET = 13.5;
1152-
MARKETING_VERSION = 1.5.4;
1094+
MARKETING_VERSION = 1.5.5;
11531095
OTHER_LDFLAGS = (
11541096
"-framework",
11551097
SafariServices,

‎apple/Shared (App)/Base.lproj/Main.html‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎apple/Shared (App)/GettingStartediPad.swift‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)