Skip to content
This repository has been archived by the owner on Mar 6, 2024. It is now read-only.

Commit

Permalink
Bug 1318786 - Individual Focus/Klar entitlements
Browse files Browse the repository at this point in the history
  • Loading branch information
@thebnich
thebnich committed Nov 19, 2016
1 parent 217efde commit fd40402
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 33 deletions.
66 changes: 35 additions & 31 deletions Blockzilla.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@
D3C70C601DDE785300CEE458 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
D3C70C651DDE785400CEE458 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
D3C70C671DDE795300CEE458 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
D3C70C711DDFCA4800CEE458 /* Klar.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Klar.entitlements; sourceTree = "<group>"; };
D3C70C721DDFCA7000CEE458 /* KlarEnterprise.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = KlarEnterprise.entitlements; sourceTree = "<group>"; };
D3CD375A1DD3B51900468250 /* FirstRunViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirstRunViewController.swift; sourceTree = "<group>"; };
D3DA77841DC2C307009C114E /* ErrorPage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ErrorPage.swift; sourceTree = "<group>"; };
D3DA778B1DC2C60E009C114E /* errorPage.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = errorPage.html; sourceTree = "<group>"; };
Expand All @@ -216,8 +218,8 @@
D3E2C96E1DA3093D00DEBE3D /* BrowserToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrowserToolbar.swift; sourceTree = "<group>"; };
D3E2C9891DA47D5300DEBE3D /* Browser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Browser.swift; sourceTree = "<group>"; };
D3E3CA7C1DA827AD0079C94B /* HomeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
D3E3CA801DA83FAF0079C94B /* Blockzilla.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Blockzilla.entitlements; sourceTree = "<group>"; };
D3E3CA811DA83FAF0079C94B /* BlockzillaEnterprise.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = BlockzillaEnterprise.entitlements; sourceTree = "<group>"; };
D3E3CA801DA83FAF0079C94B /* Focus.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Focus.entitlements; sourceTree = "<group>"; };
D3E3CA811DA83FAF0079C94B /* FocusEnterprise.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = FocusEnterprise.entitlements; sourceTree = "<group>"; };
E40AFB0F1DC9014700DA5651 /* UserAgent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserAgent.swift; sourceTree = "<group>"; };
E40AFB131DC939FF00DA5651 /* SupportUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SupportUtils.swift; sourceTree = "<group>"; };
E40AFC791DDDE98300DA5651 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
Expand All @@ -227,7 +229,7 @@
E47F9AE91DB9329D00A93285 /* Adjust-Focus.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Adjust-Focus.plist"; sourceTree = "<group>"; };
E47F9AEB1DB9333200A93285 /* Adjust-Klar.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Adjust-Klar.plist"; sourceTree = "<group>"; };
E47F9AED1DB9338600A93285 /* AdjustIntegration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdjustIntegration.swift; sourceTree = "<group>"; };
E4BF2DD31BACE8CA00DA9D68 /* Firefox Klar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Firefox Klar.app"; sourceTree = BUILT_PRODUCTS_DIR; };
E4BF2DD31BACE8CA00DA9D68 /* Klar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = Klar.app; path = "Firefox Klar.app"; sourceTree = BUILT_PRODUCTS_DIR; };
E4BF2DD61BACE8CA00DA9D68 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
E4BF2DDD1BACE8CA00DA9D68 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
E4BF2DE21BACE8CA00DA9D68 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -371,25 +373,27 @@
E4BF2DCA1BACE8CA00DA9D68 = {
isa = PBXGroup;
children = (
D3E3CA801DA83FAF0079C94B /* Blockzilla.entitlements */,
D3E3CA811DA83FAF0079C94B /* BlockzillaEnterprise.entitlements */,
D3E3CA801DA83FAF0079C94B /* Focus.entitlements */,
D3E3CA811DA83FAF0079C94B /* FocusEnterprise.entitlements */,
D3C70C711DDFCA4800CEE458 /* Klar.entitlements */,
D3C70C721DDFCA7000CEE458 /* KlarEnterprise.entitlements */,
D38D693B1C471A98003EF211 /* GCDWebServers.framework */,
D38D693C1C471A98003EF211 /* SnapKit.framework */,
D3E2C9001D9F17C600DEBE3D /* Blocklists */,
E4BF2DD51BACE8CA00DA9D68 /* Blockzilla */,
E4BF2DED1BACE92400DA9D68 /* ContentBlocker */,
0BA39A841DD2B8E4005F970A /* XCUITest */,
D77FE464056F274978E025ED /* Frameworks */,
E4BF2DD41BACE8CA00DA9D68 /* Products */,
D33A1A391BC476D40003D929 /* Shared */,
D30179D31BCDA5EE009AD388 /* ThirdParty */,
D77FE464056F274978E025ED /* Frameworks */,
0BA39A841DD2B8E4005F970A /* XCUITest */,
);
sourceTree = "<group>";
};
E4BF2DD41BACE8CA00DA9D68 /* Products */ = {
isa = PBXGroup;
children = (
E4BF2DD31BACE8CA00DA9D68 /* Firefox Klar.app */,
E4BF2DD31BACE8CA00DA9D68 /* Klar.app */,
E4BF2DEC1BACE92400DA9D68 /* ContentBlocker.appex */,
0BA39A831DD2B8E4005F970A /* XCUITest.xctest */,
);
Expand All @@ -404,7 +408,6 @@
E47F9AE91DB9329D00A93285 /* Adjust-Focus.plist */,
E47F9AEB1DB9333200A93285 /* Adjust-Klar.plist */,
E4BF2DE21BACE8CA00DA9D68 /* Info.plist */,
E40AFC761DDDE96D00DA5651 /* InfoPlist.strings */,
D3C047BC1DCBD8ED00402FFB /* SearchEngines.plist */,
D38EDB971DCA8CBD00E28196 /* splash.png */,
D38EDB951DCA8A9400E28196 /* LaunchScreen.storyboard */,
Expand Down Expand Up @@ -447,6 +450,7 @@
F805722E1DBEE504004339C1 /* WebCacheUtils.swift */,
D3426AEE1DB846BB0016DA5A /* topdomains.txt */,
E4BF2DDD1BACE8CA00DA9D68 /* Assets.xcassets */,
E40AFC761DDDE96D00DA5651 /* InfoPlist.strings */,
D343DCC41C44356500D7EEE8 /* Localizable.strings */,
D3BFCB3D1BD14F4E00AD22D1 /* LocalWebServer */,
);
Expand Down Expand Up @@ -503,7 +507,7 @@
);
name = Blockzilla;
productName = Blockzilla;
productReference = E4BF2DD31BACE8CA00DA9D68 /* Firefox Klar.app */;
productReference = E4BF2DD31BACE8CA00DA9D68 /* Klar.app */;
productType = "com.apple.product-type.application";
};
E4BF2DEB1BACE92400DA9D68 /* ContentBlocker */ = {
Expand Down Expand Up @@ -1079,7 +1083,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = BlockzillaEnterprise.entitlements;
CODE_SIGN_ENTITLEMENTS = FocusEnterprise.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 43AQ936H96;
ENABLE_NS_ASSERTIONS = YES;
Expand All @@ -1106,7 +1110,7 @@
D316DB131DA705FF006FA26B /* FocusEnterprise */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_ENTITLEMENTS = BlockzillaEnterprise.entitlements;
CODE_SIGN_ENTITLEMENTS = FocusEnterprise.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 43AQ936H96;
INFOPLIST_FILE = ContentBlocker/Info.plist;
Expand All @@ -1118,7 +1122,7 @@
};
name = FocusEnterprise;
};
D3C70C691DDFB22900CEE458 /* KlarEnterprise */ = {
D3C70C6D1DDFC48100CEE458 /* KlarEnterprise */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
Expand Down Expand Up @@ -1161,12 +1165,12 @@
};
name = KlarEnterprise;
};
D3C70C6A1DDFB22900CEE458 /* KlarEnterprise */ = {
D3C70C6E1DDFC48100CEE458 /* KlarEnterprise */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = BlockzillaEnterprise.entitlements;
CODE_SIGN_ENTITLEMENTS = KlarEnterprise.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 43AQ936H96;
ENABLE_NS_ASSERTIONS = YES;
Expand All @@ -1190,22 +1194,22 @@
};
name = KlarEnterprise;
};
D3C70C6B1DDFB22900CEE458 /* KlarEnterprise */ = {
D3C70C6F1DDFC48100CEE458 /* KlarEnterprise */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_ENTITLEMENTS = BlockzillaEnterprise.entitlements;
CODE_SIGN_ENTITLEMENTS = KlarEnterprise.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 43AQ936H96;
INFOPLIST_FILE = ContentBlocker/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = org.mozilla.ios.Focus.enterprise.ContentBlocker;
PRODUCT_BUNDLE_IDENTIFIER = org.mozilla.ios.Klar.enterprise.ContentBlocker;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
VALID_ARCHS = arm64;
};
name = KlarEnterprise;
};
D3C70C6C1DDFB22900CEE458 /* KlarEnterprise */ = {
D3C70C701DDFC48100CEE458 /* KlarEnterprise */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
Expand Down Expand Up @@ -1308,7 +1312,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements;
CODE_SIGN_ENTITLEMENTS = Focus.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 43AQ936H96;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1334,7 +1338,7 @@
D3E872AD1C471F7900BF4DE4 /* FocusDebug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements;
CODE_SIGN_ENTITLEMENTS = Focus.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 43AQ936H96;
INFOPLIST_FILE = ContentBlocker/Info.plist;
Expand Down Expand Up @@ -1394,7 +1398,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements;
CODE_SIGN_ENTITLEMENTS = Focus.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 43AQ936H96;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1415,7 +1419,7 @@
D3E872B01C471F7F00BF4DE4 /* FocusRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements;
CODE_SIGN_ENTITLEMENTS = Focus.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 43AQ936H96;
INFOPLIST_FILE = ContentBlocker/Info.plist;
Expand Down Expand Up @@ -1524,7 +1528,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements;
CODE_SIGN_ENTITLEMENTS = Klar.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 43AQ936H96;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -1552,7 +1556,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements;
CODE_SIGN_ENTITLEMENTS = Klar.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 43AQ936H96;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1573,7 +1577,7 @@
E4BF2DF71BACE92400DA9D68 /* KlarDebug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements;
CODE_SIGN_ENTITLEMENTS = Klar.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 43AQ936H96;
INFOPLIST_FILE = ContentBlocker/Info.plist;
Expand All @@ -1588,7 +1592,7 @@
E4BF2DF81BACE92400DA9D68 /* KlarRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_ENTITLEMENTS = Blockzilla.entitlements;
CODE_SIGN_ENTITLEMENTS = Klar.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 43AQ936H96;
INFOPLIST_FILE = ContentBlocker/Info.plist;
Expand All @@ -1611,7 +1615,7 @@
0BA39A8D1DD2B8E4005F970A /* KlarRelease */,
0BA39A8E1DD2B8E4005F970A /* FocusRelease */,
0BA39A8F1DD2B8E4005F970A /* FocusEnterprise */,
D3C70C6C1DDFB22900CEE458 /* KlarEnterprise */,
D3C70C701DDFC48100CEE458 /* KlarEnterprise */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = FocusRelease;
Expand All @@ -1624,7 +1628,7 @@
E4BF2DE41BACE8CA00DA9D68 /* KlarRelease */,
D3E872AE1C471F7F00BF4DE4 /* FocusRelease */,
D316DB111DA705FF006FA26B /* FocusEnterprise */,
D3C70C691DDFB22900CEE458 /* KlarEnterprise */,
D3C70C6D1DDFC48100CEE458 /* KlarEnterprise */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = FocusRelease;
Expand All @@ -1637,7 +1641,7 @@
E4BF2DE71BACE8CA00DA9D68 /* KlarRelease */,
D3E872AF1C471F7F00BF4DE4 /* FocusRelease */,
D316DB121DA705FF006FA26B /* FocusEnterprise */,
D3C70C6A1DDFB22900CEE458 /* KlarEnterprise */,
D3C70C6E1DDFC48100CEE458 /* KlarEnterprise */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = FocusRelease;
Expand All @@ -1650,7 +1654,7 @@
E4BF2DF81BACE92400DA9D68 /* KlarRelease */,
D3E872B01C471F7F00BF4DE4 /* FocusRelease */,
D316DB131DA705FF006FA26B /* FocusEnterprise */,
D3C70C6B1DDFB22900CEE458 /* KlarEnterprise */,
D3C70C6F1DDFC48100CEE458 /* KlarEnterprise */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = FocusRelease;
Expand Down
1 change: 0 additions & 1 deletion Blockzilla.entitlements → Focus.entitlements
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<key>com.apple.security.application-groups</key>
<array>
<string>group.org.mozilla.ios.Focus</string>
<string>group.org.mozilla.ios.Klar</string>
</array>
</dict>
</plist>
1 change: 0 additions & 1 deletion BlockzillaEnterprise.entitlements → FocusEnterprise.entitlements
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<key>com.apple.security.application-groups</key>
<array>
<string>group.org.mozilla.ios.Focus.enterprise</string>
<string>group.org.mozilla.ios.Klar.enterprise</string>
</array>
</dict>
</plist>
10 changes: 10 additions & 0 deletions Klar.entitlements
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.org.mozilla.ios.Klar</string>
</array>
</dict>
</plist>
10 changes: 10 additions & 0 deletions KlarEnterprise.entitlements
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.org.mozilla.ios.Klar.enterprise</string>
</array>
</dict>
</plist>

0 comments on commit fd40402

Please sign in to comment.