Skip to content

Commit

Permalink
Fix archive issues with dublicated bundle ids. Version 0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@kyzmitch
kyzmitch committed Jun 6, 2020
1 parent d695ce7 commit 033989c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 45 deletions.
57 changes: 13 additions & 44 deletions catowser/catowser.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,7 @@
8A8035FD24449C9D000E035F /* GoogleSearchEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A8035FC24449C9D000E035F /* GoogleSearchEngine.swift */; };
8A80D0D42451B1E40025528D /* URLInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A510F642424AE000070503C /* URLInfo.swift */; };
8A80D0D52451B2120025528D /* HttpKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8AE6D1692350FF35006316AD /* HttpKit.framework */; };
8A80D0D62451B2120025528D /* HttpKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8AE6D1692350FF35006316AD /* HttpKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8A80D0DA2451B3980025528D /* HttpKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8AE6D1692350FF35006316AD /* HttpKit.framework */; };
8A80D0DB2451B3980025528D /* HttpKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8AE6D1692350FF35006316AD /* HttpKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8A82CDF02351095700607162 /* HttpClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A82CDEF2351095700607162 /* HttpClient.swift */; };
8A8678AE2430F7D400450666 /* Host.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A8678AD2430F7D400450666 /* Host.swift */; };
8A8EB007245EA1BA0028D35C /* WebViewAuthChallengeHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A8EB006245EA1B90028D35C /* WebViewAuthChallengeHandler.swift */; };
Expand All @@ -234,7 +232,6 @@
8AC4368124798BE2008DD663 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = 8AC4368024798BE2008DD663 /* Alamofire */; };
8AC4368324798BE7008DD663 /* AlamofireImage in Frameworks */ = {isa = PBXBuildFile; productRef = 8AC4368224798BE7008DD663 /* AlamofireImage */; };
8AC4368424798BFC008DD663 /* SPMCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8AC4367424798BDB008DD663 /* SPMCommon.framework */; };
8AC4368524798BFC008DD663 /* SPMCommon.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8AC4367424798BDB008DD663 /* SPMCommon.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8AC4368924798C09008DD663 /* SPMCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8AC4367424798BDB008DD663 /* SPMCommon.framework */; };
8AC4368A24798C09008DD663 /* SPMCommon.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8AC4367424798BDB008DD663 /* SPMCommon.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8AC45ECB24582453007E47EE /* Combine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8AC45ECA24582453007E47EE /* Combine.framework */; };
Expand Down Expand Up @@ -408,39 +405,6 @@
name = "Embed App Extensions";
runOnlyForDeploymentPostprocessing = 0;
};
8A80D0D92451B2120025528D /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
8A80D0D62451B2120025528D /* HttpKit.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
8A80D0DE2451B3980025528D /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
8A80D0DB2451B3980025528D /* HttpKit.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
8AC4368824798BFC008DD663 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
8AC4368524798BFC008DD663 /* SPMCommon.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -1343,7 +1307,6 @@
608DA747223A3BD4009F75BD /* Frameworks */,
608DA748223A3BD4009F75BD /* Resources */,
8A875AC32378200E004FA50F /* ShellScript */,
8A80D0DE2451B3980025528D /* Embed Frameworks */,
);
buildRules = (
);
Expand All @@ -1365,7 +1328,6 @@
6094E719221FD2B9004269A2 /* Frameworks */,
6094E71A221FD2B9004269A2 /* Resources */,
8A875AC423782019004FA50F /* ShellScript */,
8A80D0D92451B2120025528D /* Embed Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -1477,7 +1439,6 @@
8AE6D1662350FF35006316AD /* Frameworks */,
8AE6D1672350FF35006316AD /* Resources */,
8A875AC223781FE6004FA50F /* ShellScript */,
8AC4368824798BFC008DD663 /* Embed Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -2418,14 +2379,15 @@
CODE_SIGN_STYLE = Manual;
COTTON_APP_NAME = "Cotton Dev";
COTTON_BUNDLE_IDENTIFIER = "com.ae.cotton-browser.debug";
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = ERT5B59458;
INFOPLIST_FILE = catowser/Base.lproj/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.2;
PRODUCT_BUNDLE_IDENTIFIER = "com.ae.cotton-browser.debug";
PRODUCT_MODULE_NAME = Cotton;
PRODUCT_NAME = "$(COTTON_APP_NAME)";
Expand All @@ -2445,14 +2407,15 @@
CODE_SIGN_STYLE = Manual;
COTTON_APP_NAME = Cotton;
COTTON_BUNDLE_IDENTIFIER = "com.ae.cotton-browser";
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = ERT5B59458;
INFOPLIST_FILE = catowser/Base.lproj/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.2;
PRODUCT_BUNDLE_IDENTIFIER = "com.ae.cotton-browser";
PRODUCT_NAME = "$(COTTON_APP_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Cotton browser AdHoc";
Expand Down Expand Up @@ -2565,7 +2528,8 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
Expand All @@ -2583,8 +2547,10 @@
);
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.ae.SPMCommon;
PRODUCT_BUNDLE_IDENTIFIER = com.ae.SPMCommon.debug;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -2597,7 +2563,8 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
Expand All @@ -2616,6 +2583,8 @@
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.ae.SPMCommon;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
2 changes: 1 addition & 1 deletion catowser/catowser/Base.lproj/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.1</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key>
Expand Down

0 comments on commit 033989c

Please sign in to comment.