Skip to content

Commit 72da3de

Browse files
twocanoestwocanoes
committed
wip
1 parent 38ddeff commit 72da3de

File tree

4 files changed

+95
-15
lines changed

4 files changed

+95
-15
lines changed

‎XCreds/XCreds-Bridging-Header.h

+1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111
#import "XCredsLoginPlugin.h"
1212
#import "TCSKeychain.h"
1313
#import "TCSUnifiedLogger.h"
14+
#import <ProductLicense/ProductLicense.h>
1415
#endif /* XCreds_Bridging_Header_h */

‎XCreds/XCredsLoginPlugin-Bridging-Header.h

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
#import "TCSUnifiedLogger.h"
77
#import "TCSReturnWindow.h"
88
#import "TCSKeychain.h"
9+
#import <ProductLicense/ProductLicense.h>

‎xCreds.xcodeproj/project.pbxproj

+93-15
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,18 @@
5454
766355E328713C4A002E3867 /* LoginWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 766355E128713C47002E3867 /* LoginWindow.swift */; };
5555
766355E5287148C1002E3867 /* Tokens.swift in Sources */ = {isa = PBXBuildFile; fileRef = 766355E4287148C1002E3867 /* Tokens.swift */; };
5656
766355E6287148C1002E3867 /* Tokens.swift in Sources */ = {isa = PBXBuildFile; fileRef = 766355E4287148C1002E3867 /* Tokens.swift */; };
57+
766CC42829D3A3DC009BC526 /* ProductLicense.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 766CC42229D3A321009BC526 /* ProductLicense.framework */; };
58+
766CC42929D3A3DC009BC526 /* ProductLicense.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 766CC42229D3A321009BC526 /* ProductLicense.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
59+
766CC42A29D3A3DC009BC526 /* Paddle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 766CC42129D3A320009BC526 /* Paddle.framework */; };
60+
766CC42B29D3A3DC009BC526 /* Paddle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 766CC42129D3A320009BC526 /* Paddle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
61+
766CC42D29D3A3EC009BC526 /* ProductLicense.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 766CC42229D3A321009BC526 /* ProductLicense.framework */; };
62+
766CC42E29D3A3EC009BC526 /* ProductLicense.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 766CC42229D3A321009BC526 /* ProductLicense.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
63+
766CC42F29D3A3EC009BC526 /* Paddle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 766CC42129D3A320009BC526 /* Paddle.framework */; };
64+
766CC43029D3A3EC009BC526 /* Paddle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 766CC42129D3A320009BC526 /* Paddle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
65+
766CC43229D3A3F8009BC526 /* ProductLicense.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 766CC42229D3A321009BC526 /* ProductLicense.framework */; };
66+
766CC43329D3A3F8009BC526 /* ProductLicense.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 766CC42229D3A321009BC526 /* ProductLicense.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
67+
766CC43429D3A3F8009BC526 /* Paddle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 766CC42129D3A320009BC526 /* Paddle.framework */; };
68+
766CC43529D3A3F8009BC526 /* Paddle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 766CC42129D3A320009BC526 /* Paddle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
5769
766F4C4B2883AFD90021F548 /* pleaseWaitGraphic.png in Resources */ = {isa = PBXBuildFile; fileRef = 766F4C4A2883AFD90021F548 /* pleaseWaitGraphic.png */; };
5870
767116A7284AABC500CCD6FF /* NotifyManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 767116A6284AABC500CCD6FF /* NotifyManager.swift */; };
5971
767116A9284AAE2B00CCD6FF /* ScheduleManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 767116A8284AAE2B00CCD6FF /* ScheduleManager.swift */; };
@@ -172,6 +184,42 @@
172184
);
173185
runOnlyForDeploymentPostprocessing = 1;
174186
};
187+
766CC42C29D3A3DC009BC526 /* Embed Frameworks */ = {
188+
isa = PBXCopyFilesBuildPhase;
189+
buildActionMask = 2147483647;
190+
dstPath = "";
191+
dstSubfolderSpec = 10;
192+
files = (
193+
766CC42B29D3A3DC009BC526 /* Paddle.framework in Embed Frameworks */,
194+
766CC42929D3A3DC009BC526 /* ProductLicense.framework in Embed Frameworks */,
195+
);
196+
name = "Embed Frameworks";
197+
runOnlyForDeploymentPostprocessing = 0;
198+
};
199+
766CC43129D3A3EC009BC526 /* Embed Frameworks */ = {
200+
isa = PBXCopyFilesBuildPhase;
201+
buildActionMask = 2147483647;
202+
dstPath = "";
203+
dstSubfolderSpec = 10;
204+
files = (
205+
766CC43029D3A3EC009BC526 /* Paddle.framework in Embed Frameworks */,
206+
766CC42E29D3A3EC009BC526 /* ProductLicense.framework in Embed Frameworks */,
207+
);
208+
name = "Embed Frameworks";
209+
runOnlyForDeploymentPostprocessing = 0;
210+
};
211+
766CC43629D3A3F8009BC526 /* Embed Frameworks */ = {
212+
isa = PBXCopyFilesBuildPhase;
213+
buildActionMask = 2147483647;
214+
dstPath = "";
215+
dstSubfolderSpec = 10;
216+
files = (
217+
766CC43529D3A3F8009BC526 /* Paddle.framework in Embed Frameworks */,
218+
766CC43329D3A3F8009BC526 /* ProductLicense.framework in Embed Frameworks */,
219+
);
220+
name = "Embed Frameworks";
221+
runOnlyForDeploymentPostprocessing = 0;
222+
};
175223
/* End PBXCopyFilesBuildPhase section */
176224

177225
/* Begin PBXFileReference section */
@@ -205,6 +253,8 @@
205253
766355DD28713485002E3867 /* LoginWebView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = LoginWebView.xib; path = XCredsLoginPlugIn/LoginWindow/LoginWebView.xib; sourceTree = SOURCE_ROOT; };
206254
766355E128713C47002E3867 /* LoginWindow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginWindow.swift; sourceTree = "<group>"; };
207255
766355E4287148C1002E3867 /* Tokens.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Tokens.swift; path = Shared/Tokens.swift; sourceTree = SOURCE_ROOT; };
256+
766CC42129D3A320009BC526 /* Paddle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Paddle.framework; path = Carthage/Build/Mac/Paddle.framework; sourceTree = "<group>"; };
257+
766CC42229D3A321009BC526 /* ProductLicense.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ProductLicense.framework; path = Carthage/Build/Mac/ProductLicense.framework; sourceTree = "<group>"; };
208258
766F4C4A2883AFD90021F548 /* pleaseWaitGraphic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pleaseWaitGraphic.png; sourceTree = "<group>"; };
209259
767116A6284AABC500CCD6FF /* NotifyManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotifyManager.swift; sourceTree = "<group>"; };
210260
767116A8284AAE2B00CCD6FF /* ScheduleManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleManager.swift; sourceTree = "<group>"; };
@@ -293,6 +343,8 @@
293343
isa = PBXFrameworksBuildPhase;
294344
buildActionMask = 2147483647;
295345
files = (
346+
766CC42D29D3A3EC009BC526 /* ProductLicense.framework in Frameworks */,
347+
766CC42F29D3A3EC009BC526 /* Paddle.framework in Frameworks */,
296348
766355CE2870E9D3002E3867 /* OIDCLite in Frameworks */,
297349
);
298350
runOnlyForDeploymentPostprocessing = 0;
@@ -301,13 +353,17 @@
301353
isa = PBXFrameworksBuildPhase;
302354
buildActionMask = 2147483647;
303355
files = (
356+
766CC43429D3A3F8009BC526 /* Paddle.framework in Frameworks */,
357+
766CC43229D3A3F8009BC526 /* ProductLicense.framework in Frameworks */,
304358
);
305359
runOnlyForDeploymentPostprocessing = 0;
306360
};
307361
76EE069727FD1D00009E0F3A /* Frameworks */ = {
308362
isa = PBXFrameworksBuildPhase;
309363
buildActionMask = 2147483647;
310364
files = (
365+
766CC42829D3A3DC009BC526 /* ProductLicense.framework in Frameworks */,
366+
766CC42A29D3A3DC009BC526 /* Paddle.framework in Frameworks */,
311367
76319369287D24F600D36BF7 /* ArgumentParser in Frameworks */,
312368
76319366287D24E100D36BF7 /* ArgumentParser in Frameworks */,
313369
76DD6D17285997F300A700ED /* OIDCLite in Frameworks */,
@@ -432,6 +488,8 @@
432488
76DD6D15285997F300A700ED /* Frameworks */ = {
433489
isa = PBXGroup;
434490
children = (
491+
766CC42129D3A320009BC526 /* Paddle.framework */,
492+
766CC42229D3A321009BC526 /* ProductLicense.framework */,
435493
);
436494
name = Frameworks;
437495
sourceTree = "<group>";
@@ -562,6 +620,7 @@
562620
766355B92870CA6A002E3867 /* Sources */,
563621
766355BA2870CA6A002E3867 /* Frameworks */,
564622
766355BB2870CA6A002E3867 /* Resources */,
623+
766CC43129D3A3EC009BC526 /* Embed Frameworks */,
565624
);
566625
buildRules = (
567626
);
@@ -582,6 +641,7 @@
582641
76DC0A6128836EB1007C42B2 /* Sources */,
583642
76DC0A6228836EB1007C42B2 /* Frameworks */,
584643
76DC0A6328836EB1007C42B2 /* Resources */,
644+
766CC43629D3A3F8009BC526 /* Embed Frameworks */,
585645
);
586646
buildRules = (
587647
);
@@ -599,11 +659,11 @@
599659
76EE069627FD1D00009E0F3A /* Sources */,
600660
76EE069727FD1D00009E0F3A /* Frameworks */,
601661
76EE069827FD1D00009E0F3A /* Resources */,
662+
766CC42C29D3A3DC009BC526 /* Embed Frameworks */,
602663
);
603664
buildRules = (
604665
);
605666
dependencies = (
606-
76DD6D14285997DA00A700ED /* PBXTargetDependency */,
607667
76DC0A7B28837152007C42B2 /* PBXTargetDependency */,
608668
76319376287E19A500D36BF7 /* PBXTargetDependency */,
609669
76319379287E204500D36BF7 /* PBXTargetDependency */,
@@ -867,10 +927,6 @@
867927
target = 76DC0A6428836EB1007C42B2 /* XCreds Login Overlay */;
868928
targetProxy = 76DC0A7A28837152007C42B2 /* PBXContainerItemProxy */;
869929
};
870-
76DD6D14285997DA00A700ED /* PBXTargetDependency */ = {
871-
isa = PBXTargetDependency;
872-
productRef = 76DD6D13285997DA00A700ED /* OIDCLite */;
873-
};
874930
/* End PBXTargetDependency section */
875931

876932
/* Begin PBXVariantGroup section */
@@ -899,6 +955,7 @@
899955
CODE_SIGN_STYLE = Automatic;
900956
DEVELOPMENT_TEAM = UXP6YEHSPW;
901957
ENABLE_HARDENED_RUNTIME = YES;
958+
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Carthage/Build/Mac\"";
902959
MACOSX_DEPLOYMENT_TARGET = 11.0;
903960
PRODUCT_NAME = "$(TARGET_NAME)";
904961
SKIP_INSTALL = YES;
@@ -915,6 +972,7 @@
915972
CODE_SIGN_STYLE = Automatic;
916973
DEVELOPMENT_TEAM = UXP6YEHSPW;
917974
ENABLE_HARDENED_RUNTIME = YES;
975+
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Carthage/Build/Mac\"";
918976
MACOSX_DEPLOYMENT_TARGET = 11.0;
919977
PRODUCT_NAME = "$(TARGET_NAME)";
920978
SKIP_INSTALL = YES;
@@ -931,9 +989,13 @@
931989
CLANG_ENABLE_MODULES = YES;
932990
CODE_SIGN_STYLE = Automatic;
933991
COMBINE_HIDPI_IMAGES = YES;
934-
CURRENT_PROJECT_VERSION = 3501;
992+
CURRENT_PROJECT_VERSION = 3504;
935993
DEFINES_MODULE = YES;
936994
DEVELOPMENT_TEAM = UXP6YEHSPW;
995+
FRAMEWORK_SEARCH_PATHS = (
996+
"\"$(SRCROOT)/Carthage/Build/Mac\"",
997+
"$(PROJECT_DIR)/Carthage/Build/Mac",
998+
);
937999
GENERATE_INFOPLIST_FILE = YES;
9381000
INFOPLIST_FILE = XCredsLoginPlugin/Info.plist;
9391001
INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -964,9 +1026,13 @@
9641026
CLANG_ENABLE_MODULES = YES;
9651027
CODE_SIGN_STYLE = Automatic;
9661028
COMBINE_HIDPI_IMAGES = YES;
967-
CURRENT_PROJECT_VERSION = 3501;
1029+
CURRENT_PROJECT_VERSION = 3504;
9681030
DEFINES_MODULE = YES;
9691031
DEVELOPMENT_TEAM = UXP6YEHSPW;
1032+
FRAMEWORK_SEARCH_PATHS = (
1033+
"\"$(SRCROOT)/Carthage/Build/Mac\"",
1034+
"$(PROJECT_DIR)/Carthage/Build/Mac",
1035+
);
9701036
GENERATE_INFOPLIST_FILE = YES;
9711037
INFOPLIST_FILE = XCredsLoginPlugin/Info.plist;
9721038
INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -1025,9 +1091,13 @@
10251091
CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
10261092
CODE_SIGN_STYLE = Automatic;
10271093
COMBINE_HIDPI_IMAGES = YES;
1028-
CURRENT_PROJECT_VERSION = 3501;
1094+
CURRENT_PROJECT_VERSION = 3504;
10291095
DEVELOPMENT_TEAM = UXP6YEHSPW;
10301096
ENABLE_HARDENED_RUNTIME = YES;
1097+
FRAMEWORK_SEARCH_PATHS = (
1098+
"\"$(SRCROOT)/Carthage/Build/Mac\"",
1099+
"$(PROJECT_DIR)/Carthage/Build/Mac",
1100+
);
10311101
GENERATE_INFOPLIST_FILE = YES;
10321102
INFOPLIST_FILE = "XCreds-Login-Overlay-Info.plist";
10331103
INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -1057,9 +1127,13 @@
10571127
CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
10581128
CODE_SIGN_STYLE = Automatic;
10591129
COMBINE_HIDPI_IMAGES = YES;
1060-
CURRENT_PROJECT_VERSION = 3501;
1130+
CURRENT_PROJECT_VERSION = 3504;
10611131
DEVELOPMENT_TEAM = UXP6YEHSPW;
10621132
ENABLE_HARDENED_RUNTIME = YES;
1133+
FRAMEWORK_SEARCH_PATHS = (
1134+
"\"$(SRCROOT)/Carthage/Build/Mac\"",
1135+
"$(PROJECT_DIR)/Carthage/Build/Mac",
1136+
);
10631137
GENERATE_INFOPLIST_FILE = YES;
10641138
INFOPLIST_FILE = "XCreds-Login-Overlay-Info.plist";
10651139
INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -1202,9 +1276,13 @@
12021276
CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
12031277
CODE_SIGN_STYLE = Automatic;
12041278
COMBINE_HIDPI_IMAGES = YES;
1205-
CURRENT_PROJECT_VERSION = 3501;
1279+
CURRENT_PROJECT_VERSION = 3504;
12061280
DEVELOPMENT_TEAM = UXP6YEHSPW;
12071281
ENABLE_HARDENED_RUNTIME = YES;
1282+
FRAMEWORK_SEARCH_PATHS = (
1283+
"\"$(SRCROOT)/Carthage/Build/Mac\"",
1284+
"$(PROJECT_DIR)/Carthage/Build/Mac",
1285+
);
12081286
GENERATE_INFOPLIST_FILE = YES;
12091287
INFOPLIST_FILE = XCreds/Info.plist;
12101288
INFOPLIST_KEY_NSHumanReadableCopyright = "© 2022 Twocanoes Software, Inc";
@@ -1233,9 +1311,13 @@
12331311
CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
12341312
CODE_SIGN_STYLE = Automatic;
12351313
COMBINE_HIDPI_IMAGES = YES;
1236-
CURRENT_PROJECT_VERSION = 3501;
1314+
CURRENT_PROJECT_VERSION = 3504;
12371315
DEVELOPMENT_TEAM = UXP6YEHSPW;
12381316
ENABLE_HARDENED_RUNTIME = YES;
1317+
FRAMEWORK_SEARCH_PATHS = (
1318+
"\"$(SRCROOT)/Carthage/Build/Mac\"",
1319+
"$(PROJECT_DIR)/Carthage/Build/Mac",
1320+
);
12391321
GENERATE_INFOPLIST_FILE = YES;
12401322
INFOPLIST_FILE = XCreds/Info.plist;
12411323
INFOPLIST_KEY_NSHumanReadableCopyright = "© 2022 Twocanoes Software, Inc";
@@ -1354,10 +1436,6 @@
13541436
isa = XCSwiftPackageProductDependency;
13551437
productName = OIDCLite;
13561438
};
1357-
76DD6D13285997DA00A700ED /* OIDCLite */ = {
1358-
isa = XCSwiftPackageProductDependency;
1359-
productName = OIDCLite;
1360-
};
13611439
76DD6D16285997F300A700ED /* OIDCLite */ = {
13621440
isa = XCSwiftPackageProductDependency;
13631441
productName = OIDCLite;

‎xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate

-31.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)