Skip to content

Commit 355ac80

Browse files
author
cavi_13pro
committedMar 6, 2024
Prepare for release 1.0.13
·
v1.1.3v1.0.13
1 parent d53a088 commit 355ac80

File tree

3 files changed

+50
-33
lines changed

3 files changed

+50
-33
lines changed
 

‎Extension/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Automatic handling of GDPR consent forms",
44
"author": "CAVI - Aarhus University",
55
"homepage_url": "https://github.com/cavi-au/Consent-O-Matic",
6-
"version": "1.0.12",
6+
"version": "1.0.13",
77
"manifest_version": 2,
88
"permissions": [
99
"activeTab",

‎xcode/Consent-O-Matic.xcodeproj/project.pbxproj

+43-27
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
7A137F982930D8D0003A3F07 /* minimize.svg in Resources */ = {isa = PBXBuildFile; fileRef = 7A137F962930D8D0003A3F07 /* minimize.svg */; };
11+
7A137F992930D8D0003A3F07 /* minimize.svg in Resources */ = {isa = PBXBuildFile; fileRef = 7A137F962930D8D0003A3F07 /* minimize.svg */; };
12+
7A137F9A2930D8D0003A3F07 /* hide.svg in Resources */ = {isa = PBXBuildFile; fileRef = 7A137F972930D8D0003A3F07 /* hide.svg */; };
13+
7A137F9B2930D8D0003A3F07 /* hide.svg in Resources */ = {isa = PBXBuildFile; fileRef = 7A137F972930D8D0003A3F07 /* hide.svg */; };
1014
7A27C71C27A2A2D0008AECB6 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 7A27C71B27A2A2D0008AECB6 /* Icon.png */; };
1115
7A27C71D27A2A2D0008AECB6 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 7A27C71B27A2A2D0008AECB6 /* Icon.png */; };
1216
7A84BB8A27BCFB98000AC8E0 /* language.js in Resources */ = {isa = PBXBuildFile; fileRef = 7A84BB8927BCFB98000AC8E0 /* language.js */; };
@@ -17,8 +21,8 @@
1721
7ABDB9F7279FED16001F98FD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7ABDB9F5279FED16001F98FD /* Main.storyboard */; };
1822
7ABDBA00279FED16001F98FD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ABDB9FF279FED16001F98FD /* AppDelegate.swift */; };
1923
7ABDBA03279FED16001F98FD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7ABDBA01279FED16001F98FD /* Main.storyboard */; };
20-
7ABDBA0B279FED16001F98FD /* Consent-O-Matic Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 7ABDBA0A279FED16001F98FD /* Consent-O-Matic Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
21-
7ABDBA15279FED16001F98FD /* Consent-O-Matic Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 7ABDBA14279FED16001F98FD /* Consent-O-Matic Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
24+
7ABDBA0B279FED16001F98FD /* Consent-O-Matic Extension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 7ABDBA0A279FED16001F98FD /* Consent-O-Matic Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
25+
7ABDBA15279FED16001F98FD /* Consent-O-Matic Extension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 7ABDBA14279FED16001F98FD /* Consent-O-Matic Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
2226
7ABDBA1B279FED16001F98FD /* Main.html in Resources */ = {isa = PBXBuildFile; fileRef = 7ABDB9DE279FED13001F98FD /* Main.html */; };
2327
7ABDBA1C279FED16001F98FD /* Main.html in Resources */ = {isa = PBXBuildFile; fileRef = 7ABDB9DE279FED13001F98FD /* Main.html */; };
2428
7ABDBA1F279FED16001F98FD /* Style.css in Resources */ = {isa = PBXBuildFile; fileRef = 7ABDB9E1279FED13001F98FD /* Style.css */; };
@@ -93,31 +97,33 @@
9397
/* End PBXContainerItemProxy section */
9498

9599
/* Begin PBXCopyFilesBuildPhase section */
96-
7ABDBA2E279FED16001F98FD /* Embed App Extensions */ = {
100+
7ABDBA2E279FED16001F98FD /* Embed Foundation Extensions */ = {
97101
isa = PBXCopyFilesBuildPhase;
98102
buildActionMask = 2147483647;
99103
dstPath = "";
100104
dstSubfolderSpec = 13;
101105
files = (
102-
7ABDBA0B279FED16001F98FD /* Consent-O-Matic Extension.appex in Embed App Extensions */,
106+
7ABDBA0B279FED16001F98FD /* Consent-O-Matic Extension.appex in Embed Foundation Extensions */,
103107
);
104-
name = "Embed App Extensions";
108+
name = "Embed Foundation Extensions";
105109
runOnlyForDeploymentPostprocessing = 0;
106110
};
107-
7ABDBA35279FED16001F98FD /* Embed App Extensions */ = {
111+
7ABDBA35279FED16001F98FD /* Embed Foundation Extensions */ = {
108112
isa = PBXCopyFilesBuildPhase;
109113
buildActionMask = 2147483647;
110114
dstPath = "";
111115
dstSubfolderSpec = 13;
112116
files = (
113-
7ABDBA15279FED16001F98FD /* Consent-O-Matic Extension.appex in Embed App Extensions */,
117+
7ABDBA15279FED16001F98FD /* Consent-O-Matic Extension.appex in Embed Foundation Extensions */,
114118
);
115-
name = "Embed App Extensions";
119+
name = "Embed Foundation Extensions";
116120
runOnlyForDeploymentPostprocessing = 0;
117121
};
118122
/* End PBXCopyFilesBuildPhase section */
119123

120124
/* Begin PBXFileReference section */
125+
7A137F962930D8D0003A3F07 /* minimize.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = minimize.svg; path = ../../Extension/minimize.svg; sourceTree = "<group>"; };
126+
7A137F972930D8D0003A3F07 /* hide.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = hide.svg; path = ../../Extension/hide.svg; sourceTree = "<group>"; };
121127
7A27C71B27A2A2D0008AECB6 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
122128
7A84BB8927BCFB98000AC8E0 /* language.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = language.js; path = ../../Extension/language.js; sourceTree = "<group>"; };
123129
7ABDB9DF279FED13001F98FD /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = Base; path = ../Base.lproj/Main.html; sourceTree = "<group>"; };
@@ -294,6 +300,8 @@
294300
7ABDBA39279FED18001F98FD /* Resources */ = {
295301
isa = PBXGroup;
296302
children = (
303+
7A137F972930D8D0003A3F07 /* hide.svg */,
304+
7A137F962930D8D0003A3F07 /* minimize.svg */,
297305
7A84BB8927BCFB98000AC8E0 /* language.js */,
298306
7ABDBA3A279FED18001F98FD /* Tools.js */,
299307
7ABDBA3B279FED18001F98FD /* Action.js */,
@@ -331,7 +339,7 @@
331339
7ABDB9E7279FED16001F98FD /* Sources */,
332340
7ABDB9E8279FED16001F98FD /* Frameworks */,
333341
7ABDB9E9279FED16001F98FD /* Resources */,
334-
7ABDBA2E279FED16001F98FD /* Embed App Extensions */,
342+
7ABDBA2E279FED16001F98FD /* Embed Foundation Extensions */,
335343
);
336344
buildRules = (
337345
);
@@ -350,7 +358,7 @@
350358
7ABDB9F9279FED16001F98FD /* Sources */,
351359
7ABDB9FA279FED16001F98FD /* Frameworks */,
352360
7ABDB9FB279FED16001F98FD /* Resources */,
353-
7ABDBA35279FED16001F98FD /* Embed App Extensions */,
361+
7ABDBA35279FED16001F98FD /* Embed Foundation Extensions */,
354362
);
355363
buildRules = (
356364
);
@@ -404,7 +412,7 @@
404412
attributes = {
405413
BuildIndependentTargetsInParallel = 1;
406414
LastSwiftUpdateCheck = 1320;
407-
LastUpgradeCheck = 1320;
415+
LastUpgradeCheck = 1420;
408416
TargetAttributes = {
409417
7ABDB9EA279FED16001F98FD = {
410418
CreatedOnToolsVersion = 13.2.1;
@@ -481,13 +489,15 @@
481489
7ABDBA77279FED18001F98FD /* editor in Resources */,
482490
7ABDBA74279FED18001F98FD /* icon_48.png in Resources */,
483491
7ABDBA67279FED18001F98FD /* icon_96.png in Resources */,
492+
7A137F982930D8D0003A3F07 /* minimize.svg in Resources */,
484493
7ABDBA6A279FED18001F98FD /* ConsentEngine.js in Resources */,
485494
7ABDBA78279FED18001F98FD /* contentScript.js in Resources */,
486495
7ABDBA66279FED18001F98FD /* popup.js in Resources */,
487496
7ABDBA6E279FED18001F98FD /* Matcher.js in Resources */,
488497
7ABDBA68279FED18001F98FD /* content.css in Resources */,
489498
7ABDBA69279FED18001F98FD /* background.js in Resources */,
490499
7ABDBA6D279FED18001F98FD /* Detector.js in Resources */,
500+
7A137F9A2930D8D0003A3F07 /* hide.svg in Resources */,
491501
7ABDBA73279FED18001F98FD /* options.html in Resources */,
492502
7ABDBA71279FED18001F98FD /* GDPRConfig.js in Resources */,
493503
7ABDBA6F279FED18001F98FD /* icon_128.png in Resources */,
@@ -510,13 +520,15 @@
510520
7ABDBA62279FED18001F98FD /* editor in Resources */,
511521
7ABDBA5F279FED18001F98FD /* icon_48.png in Resources */,
512522
7ABDBA52279FED18001F98FD /* icon_96.png in Resources */,
523+
7A137F992930D8D0003A3F07 /* minimize.svg in Resources */,
513524
7ABDBA55279FED18001F98FD /* ConsentEngine.js in Resources */,
514525
7ABDBA63279FED18001F98FD /* contentScript.js in Resources */,
515526
7ABDBA51279FED18001F98FD /* popup.js in Resources */,
516527
7ABDBA59279FED18001F98FD /* Matcher.js in Resources */,
517528
7ABDBA53279FED18001F98FD /* content.css in Resources */,
518529
7ABDBA54279FED18001F98FD /* background.js in Resources */,
519530
7ABDBA58279FED18001F98FD /* Detector.js in Resources */,
531+
7A137F9B2930D8D0003A3F07 /* hide.svg in Resources */,
520532
7ABDBA5E279FED18001F98FD /* options.html in Resources */,
521533
7ABDBA5C279FED18001F98FD /* GDPRConfig.js in Resources */,
522534
7ABDBA5A279FED18001F98FD /* icon_128.png in Resources */,
@@ -731,7 +743,7 @@
731743
isa = XCBuildConfiguration;
732744
buildSettings = {
733745
CODE_SIGN_STYLE = Automatic;
734-
CURRENT_PROJECT_VERSION = 1;
746+
CURRENT_PROJECT_VERSION = 14;
735747
DEVELOPMENT_TEAM = QP7836JDJP;
736748
GENERATE_INFOPLIST_FILE = YES;
737749
INFOPLIST_FILE = "iOS (Extension)/Info.plist";
@@ -743,7 +755,7 @@
743755
"@executable_path/Frameworks",
744756
"@executable_path/../../Frameworks",
745757
);
746-
MARKETING_VERSION = 1.0.2;
758+
MARKETING_VERSION = 1.0.13;
747759
OTHER_LDFLAGS = (
748760
"-framework",
749761
SafariServices,
@@ -762,7 +774,7 @@
762774
isa = XCBuildConfiguration;
763775
buildSettings = {
764776
CODE_SIGN_STYLE = Automatic;
765-
CURRENT_PROJECT_VERSION = 1;
777+
CURRENT_PROJECT_VERSION = 14;
766778
DEVELOPMENT_TEAM = QP7836JDJP;
767779
GENERATE_INFOPLIST_FILE = YES;
768780
INFOPLIST_FILE = "iOS (Extension)/Info.plist";
@@ -774,7 +786,7 @@
774786
"@executable_path/Frameworks",
775787
"@executable_path/../../Frameworks",
776788
);
777-
MARKETING_VERSION = 1.0.2;
789+
MARKETING_VERSION = 1.0.13;
778790
OTHER_LDFLAGS = (
779791
"-framework",
780792
SafariServices,
@@ -797,7 +809,7 @@
797809
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
798810
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
799811
CODE_SIGN_STYLE = Automatic;
800-
CURRENT_PROJECT_VERSION = 1;
812+
CURRENT_PROJECT_VERSION = 14;
801813
DEVELOPMENT_TEAM = QP7836JDJP;
802814
GENERATE_INFOPLIST_FILE = YES;
803815
INFOPLIST_FILE = "iOS (App)/Info.plist";
@@ -812,7 +824,7 @@
812824
"$(inherited)",
813825
"@executable_path/Frameworks",
814826
);
815-
MARKETING_VERSION = 1.0.2;
827+
MARKETING_VERSION = 1.0.13;
816828
OTHER_LDFLAGS = (
817829
"-framework",
818830
SafariServices,
@@ -835,7 +847,7 @@
835847
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
836848
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
837849
CODE_SIGN_STYLE = Automatic;
838-
CURRENT_PROJECT_VERSION = 1;
850+
CURRENT_PROJECT_VERSION = 14;
839851
DEVELOPMENT_TEAM = QP7836JDJP;
840852
GENERATE_INFOPLIST_FILE = YES;
841853
INFOPLIST_FILE = "iOS (App)/Info.plist";
@@ -850,7 +862,7 @@
850862
"$(inherited)",
851863
"@executable_path/Frameworks",
852864
);
853-
MARKETING_VERSION = 1.0.2;
865+
MARKETING_VERSION = 1.0.13;
854866
OTHER_LDFLAGS = (
855867
"-framework",
856868
SafariServices,
@@ -871,8 +883,9 @@
871883
isa = XCBuildConfiguration;
872884
buildSettings = {
873885
CODE_SIGN_ENTITLEMENTS = "macOS (Extension)/Consent-O-Matic.entitlements";
886+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
874887
CODE_SIGN_STYLE = Automatic;
875-
CURRENT_PROJECT_VERSION = 1;
888+
CURRENT_PROJECT_VERSION = 14;
876889
DEVELOPMENT_TEAM = QP7836JDJP;
877890
ENABLE_HARDENED_RUNTIME = YES;
878891
GENERATE_INFOPLIST_FILE = YES;
@@ -885,7 +898,7 @@
885898
"@executable_path/../../../../Frameworks",
886899
);
887900
MACOSX_DEPLOYMENT_TARGET = 10.14;
888-
MARKETING_VERSION = 1.0.2;
901+
MARKETING_VERSION = 1.0.13;
889902
OTHER_LDFLAGS = (
890903
"-framework",
891904
SafariServices,
@@ -903,8 +916,9 @@
903916
isa = XCBuildConfiguration;
904917
buildSettings = {
905918
CODE_SIGN_ENTITLEMENTS = "macOS (Extension)/Consent-O-Matic.entitlements";
919+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
906920
CODE_SIGN_STYLE = Automatic;
907-
CURRENT_PROJECT_VERSION = 1;
921+
CURRENT_PROJECT_VERSION = 14;
908922
DEVELOPMENT_TEAM = QP7836JDJP;
909923
ENABLE_HARDENED_RUNTIME = YES;
910924
GENERATE_INFOPLIST_FILE = YES;
@@ -917,7 +931,7 @@
917931
"@executable_path/../../../../Frameworks",
918932
);
919933
MACOSX_DEPLOYMENT_TARGET = 10.14;
920-
MARKETING_VERSION = 1.0.2;
934+
MARKETING_VERSION = 1.0.13;
921935
OTHER_LDFLAGS = (
922936
"-framework",
923937
SafariServices,
@@ -939,8 +953,9 @@
939953
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
940954
CODE_SIGN_ENTITLEMENTS = "macOS (App)/Consent-O-Matic.entitlements";
941955
CODE_SIGN_IDENTITY = "Apple Development";
956+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
942957
CODE_SIGN_STYLE = Automatic;
943-
CURRENT_PROJECT_VERSION = 1;
958+
CURRENT_PROJECT_VERSION = 14;
944959
DEVELOPMENT_TEAM = QP7836JDJP;
945960
ENABLE_HARDENED_RUNTIME = YES;
946961
GENERATE_INFOPLIST_FILE = YES;
@@ -954,7 +969,7 @@
954969
"@executable_path/../Frameworks",
955970
);
956971
MACOSX_DEPLOYMENT_TARGET = 10.14;
957-
MARKETING_VERSION = 1.0.2;
972+
MARKETING_VERSION = 1.0.13;
958973
OTHER_LDFLAGS = (
959974
"-framework",
960975
SafariServices,
@@ -978,8 +993,9 @@
978993
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
979994
CODE_SIGN_ENTITLEMENTS = "macOS (App)/Consent-O-Matic.entitlements";
980995
CODE_SIGN_IDENTITY = "Apple Development";
996+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
981997
CODE_SIGN_STYLE = Automatic;
982-
CURRENT_PROJECT_VERSION = 1;
998+
CURRENT_PROJECT_VERSION = 14;
983999
DEVELOPMENT_TEAM = QP7836JDJP;
9841000
ENABLE_HARDENED_RUNTIME = YES;
9851001
GENERATE_INFOPLIST_FILE = YES;
@@ -993,7 +1009,7 @@
9931009
"@executable_path/../Frameworks",
9941010
);
9951011
MACOSX_DEPLOYMENT_TARGET = 10.14;
996-
MARKETING_VERSION = 1.0.2;
1012+
MARKETING_VERSION = 1.0.13;
9971013
OTHER_LDFLAGS = (
9981014
"-framework",
9991015
SafariServices,

‎xcode/macOS (App)/Base.lproj/Main.storyboard

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19085" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19085"/>
5-
<plugIn identifier="com.apple.WebKit2IBPlugin" version="19085"/>
4+
<deployment identifier="macosx"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
6+
<plugIn identifier="com.apple.WebKit2IBPlugin" version="21507"/>
67
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
78
</dependencies>
89
<scenes>
@@ -67,7 +68,7 @@
6768
<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
6869
</connections>
6970
</application>
70-
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider="target"/>
71+
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Consent_O_Matic" customModuleProvider="target"/>
7172
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
7273
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
7374
</objects>
@@ -97,7 +98,7 @@
9798
<!--View Controller-->
9899
<scene sceneID="hIz-AP-VOD">
99100
<objects>
100-
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
101+
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="Consent_O_Matic" customModuleProvider="target" sceneMemberID="viewController">
101102
<view key="view" id="m2S-Jp-Qdl">
102103
<rect key="frame" x="0.0" y="0.0" width="425" height="325"/>
103104
<autoresizingMask key="autoresizingMask"/>

0 commit comments

Comments
 (0)
Please sign in to comment.