Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Erroneously formatted files in the project #3

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: Erroneously formatted files in the project #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92cc6d2
fix: Erroneously formatted files in the project
ArthurCarli Aug 31, 2024
9f40cb2
fix: Remove missing Pass-Constant-Black.plist & Pass-Constant-Scienti…
ArthurCarli Aug 31, 2024
de8e8ab
fix: Various build errors related to APP_VERSION_IDENTIFIER & IS_QA_B…
ArthurCarli Aug 31, 2024
321306e
doc: Add instruction on where to find the PassRustCore library
ArthurCarli Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions AutoFill/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>APP_VERSION_IDENTIFIER =
<string>$(APP_VERSION_IDENTIFIER =
<key>IS_QA_BUILD =
<string>$(IS_QA_BUILD =
<key>APP_VERSION_IDENTIFIER</key>
<string>$(APP_VERSION_IDENTIFIER)</string>
<key>IS_QA_BUILD</key>
<string>$(IS_QA_BUILD)</string>
<key>MODULE</key>
<string>AUTOFILL_EXTENSION</string>
<key>NSExtension</key>
Expand Down
6 changes: 3 additions & 3 deletions LocalPackages/Core/Sources/Core/Utilities/BundleExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import Foundation
public extension Bundle {
var versionNumber: String { string(forKey: "CFBundleShortVersionString") ?? "0.0.0" }
var buildNumber: String { string(forKey: "CFBundleVersion") ?? "0" }
var versionIdentifier: String? { string(forKey: "APP_VERSION_IDENTIFIER =
var versionIdentifier: String? { string(forKey: "APP_VERSION_IDENTIFIER") }
var gitCommitHash: String? { string(forKey: "GIT_COMMIT_HASH") }
var isQaBuild: Bool { bool(forKey: "IS_QA_BUILD =
var isBetaBuild: Bool { bool(forKey: "IS_BETA_BUILD =
var isQaBuild: Bool { bool(forKey: "IS_QA_BUILD") }
var isBetaBuild: Bool { bool(forKey: "IS_BETA_BUILD")}

/// Get the full name of the current version e.g "1.0.0-dev" or "1.2.0"
var fullAppVersionName: String {
Expand Down
36 changes: 10 additions & 26 deletions ProtonPass.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,6 @@
3567DF4D2A49C7950025BD88 /* UpsellableDetailText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3567DF4C2A49C7950025BD88 /* UpsellableDetailText.swift */; };
3567E46629B0E6F900511D62 /* NoCameraPermissionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3567E46529B0E6F900511D62 /* NoCameraPermissionView.swift */; };
3567E46729B0ED8400511D62 /* NoCameraPermissionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3567E46529B0E6F900511D62 /* NoCameraPermissionView.swift */; };
3569AE422A6983440026B780 /* Pass-Constant-Scientist.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3569AE412A6983440026B780 /* Pass-Constant-Scientist.plist */; };
3569AE432A69842F0026B780 /* Pass-Constant-Scientist.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3569AE412A6983440026B780 /* Pass-Constant-Scientist.plist */; };
3569B29B29B76BF60070830B /* VaultsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3569B29A29B76BF60070830B /* VaultsManager.swift */; };
3569B2A129B788600070830B /* ItemsTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3569B2A029B788600070830B /* ItemsTabView.swift */; };
3569B2A429B7BA280070830B /* ItemsTabViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3569B2A329B7BA280070830B /* ItemsTabViewModel.swift */; };
Expand Down Expand Up @@ -289,9 +287,7 @@
357C71D32B5FB51800AA0BF1 /* CodeScanner in Frameworks */ = {isa = PBXBuildFile; productRef = 357C71D22B5FB51800AA0BF1 /* CodeScanner */; };
357C71D52B5FB52C00AA0BF1 /* Screens in Frameworks */ = {isa = PBXBuildFile; productRef = 357C71D42B5FB52C00AA0BF1 /* Screens */; };
357C71D72B5FB9BC00AA0BF1 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 5BCF619E2ABB1171002AD351 /* Localizable.xcstrings */; };
357C71D92B5FE50C00AA0BF1 /* Pass-Constant-Black.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5BB2B6EA2A44540D005E831C /* Pass-Constant-Black.plist */; };
357C71DA2B5FE50E00AA0BF1 /* Pass-Constant-Prod.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5BB2B6EC2A445422005E831C /* Pass-Constant-Prod.plist */; };
357C71DB2B5FE51000AA0BF1 /* Pass-Constant-Scientist.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3569AE412A6983440026B780 /* Pass-Constant-Scientist.plist */; };
357C71DC2B5FF46600AA0BF1 /* VaultSelectorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35702C932A1E41C90089B539 /* VaultSelectorViewModel.swift */; };
357C71DD2B5FF46900AA0BF1 /* VaultSelectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3561C9F529E6CDFA00D6E518 /* VaultSelectorView.swift */; };
357C71DE2B5FF49700AA0BF1 /* VaultRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 355694A129D466C9005DD2EB /* VaultRow.swift */; };
Expand Down Expand Up @@ -500,9 +496,7 @@
5BAE710C2BCEDAEC00F579E4 /* DarkWebMonitorHomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BAE710A2BCEDAEC00F579E4 /* DarkWebMonitorHomeViewModel.swift */; };
5BAE71102BD1128400F579E4 /* AddCustomEmailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BAE710E2BD1128400F579E4 /* AddCustomEmailView.swift */; };
5BAE71112BD1128400F579E4 /* AddCustomEmailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BAE710F2BD1128400F579E4 /* AddCustomEmailViewModel.swift */; };
5BB2B6EB2A44540D005E831C /* Pass-Constant-Black.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5BB2B6EA2A44540D005E831C /* Pass-Constant-Black.plist */; };
5BB2B6ED2A445422005E831C /* Pass-Constant-Prod.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5BB2B6EC2A445422005E831C /* Pass-Constant-Prod.plist */; };
5BB2B6F12A457F4C005E831C /* Pass-Constant-Black.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5BB2B6EA2A44540D005E831C /* Pass-Constant-Black.plist */; };
5BB2B6F22A457F50005E831C /* Pass-Constant-Prod.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5BB2B6EC2A445422005E831C /* Pass-Constant-Prod.plist */; };
5BB403792BF64B18005BF271 /* CreateSecureLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB403772BF64B18005BF271 /* CreateSecureLinkView.swift */; };
5BB4037A2BF64B18005BF271 /* CreateSecureLinkViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB403782BF64B18005BF271 /* CreateSecureLinkViewModel.swift */; };
Expand Down Expand Up @@ -755,7 +749,6 @@
3567DF4C2A49C7950025BD88 /* UpsellableDetailText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpsellableDetailText.swift; sourceTree = "<group>"; };
3567E46529B0E6F900511D62 /* NoCameraPermissionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoCameraPermissionView.swift; sourceTree = "<group>"; };
3569AE402A695E070026B780 /* Entities */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Entities; path = LocalPackages/Entities; sourceTree = "<group>"; };
3569AE412A6983440026B780 /* Pass-Constant-Scientist.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Pass-Constant-Scientist.plist"; sourceTree = "<group>"; };
3569B29A29B76BF60070830B /* VaultsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VaultsManager.swift; sourceTree = "<group>"; };
3569B2A029B788600070830B /* ItemsTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemsTabView.swift; sourceTree = "<group>"; };
3569B2A329B7BA280070830B /* ItemsTabViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemsTabViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -980,7 +973,6 @@
5BAE710A2BCEDAEC00F579E4 /* DarkWebMonitorHomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DarkWebMonitorHomeViewModel.swift; sourceTree = "<group>"; };
5BAE710E2BD1128400F579E4 /* AddCustomEmailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddCustomEmailView.swift; sourceTree = "<group>"; };
5BAE710F2BD1128400F579E4 /* AddCustomEmailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddCustomEmailViewModel.swift; sourceTree = "<group>"; };
5BB2B6EA2A44540D005E831C /* Pass-Constant-Black.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Pass-Constant-Black.plist"; sourceTree = "<group>"; };
5BB2B6EC2A445422005E831C /* Pass-Constant-Prod.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Pass-Constant-Prod.plist"; sourceTree = "<group>"; };
5BB403772BF64B18005BF271 /* CreateSecureLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateSecureLinkView.swift; sourceTree = "<group>"; };
5BB403782BF64B18005BF271 /* CreateSecureLinkViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateSecureLinkViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2193,9 +2185,7 @@
5BB2B6E92A4453BD005E831C /* Configurations */ = {
isa = PBXGroup;
children = (
5BB2B6EA2A44540D005E831C /* Pass-Constant-Black.plist */,
5BB2B6EC2A445422005E831C /* Pass-Constant-Prod.plist */,
3569AE412A6983440026B780 /* Pass-Constant-Scientist.plist */,
);
path = Configurations;
sourceTree = "<group>";
Expand Down Expand Up @@ -2757,10 +2747,8 @@
files = (
35ECCEE02BA48E1B00202613 /* PrivacyInfo.xcprivacy in Resources */,
5BB2B6F22A457F50005E831C /* Pass-Constant-Prod.plist in Resources */,
3569AE432A69842F0026B780 /* Pass-Constant-Scientist.plist in Resources */,
5BCF61A02ABB1171002AD351 /* Localizable.xcstrings in Resources */,
3544F5E728E2341900834CA4 /* MainInterface.storyboard in Resources */,
5BB2B6F12A457F4C005E831C /* Pass-Constant-Black.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -2776,8 +2764,6 @@
buildActionMask = 2147483647;
files = (
35ECCEE22BA48E1C00202613 /* PrivacyInfo.xcprivacy in Resources */,
357C71DB2B5FE51000AA0BF1 /* Pass-Constant-Scientist.plist in Resources */,
357C71D92B5FE50C00AA0BF1 /* Pass-Constant-Black.plist in Resources */,
357C71D72B5FB9BC00AA0BF1 /* Localizable.xcstrings in Resources */,
357C71DA2B5FE50E00AA0BF1 /* Pass-Constant-Prod.plist in Resources */,
35C9B81A2B5E8AA90062D787 /* MainInterface.storyboard in Resources */,
Expand All @@ -2790,9 +2776,7 @@
files = (
66E960D529F046C6004D96AF /* PassLaunchScreen.storyboard in Resources */,
35E50648286F819F00A3F6EA /* Assets.xcassets in Resources */,
5BB2B6EB2A44540D005E831C /* Pass-Constant-Black.plist in Resources */,
5B748B1E2BA335CD00A4CAD6 /* PrivacyInfo.xcprivacy in Resources */,
3569AE422A6983440026B780 /* Pass-Constant-Scientist.plist in Resources */,
FAD3ABA52A862A880004053E /* Proton Pass - Password Manager.storekit in Resources */,
5BB2B6ED2A445422005E831C /* Pass-Constant-Prod.plist in Resources */,
35C2ED8F2BA0507200E94BAA /* InfoPlist.xcstrings in Resources */,
Expand Down Expand Up @@ -3608,7 +3592,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
APP_VERSION_IDENTIFIER =
APP_VERSION_IDENTIFIER = 1.12.3;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
Expand Down Expand Up @@ -3660,7 +3644,7 @@
INFOPLIST_KEY_CFBundleDisplayName = AutoFill;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
IS_QA_BUILD =
IS_QA_BUILD = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -4557,7 +4541,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
APP_VERSION_IDENTIFIER =
APP_VERSION_IDENTIFIER = 1.12.3;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down Expand Up @@ -4616,7 +4600,7 @@
INFOPLIST_KEY_CFBundleDisplayName = Share;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
IS_QA_BUILD =
IS_QA_BUILD = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -4642,7 +4626,7 @@
35C9B8202B5E8AA90062D787 /* Release-QA */ = {
isa = XCBuildConfiguration;
buildSettings = {
APP_VERSION_IDENTIFIER =
APP_VERSION_IDENTIFIER = 1.12.3;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_ENTITLEMENTS = Share/Share.entitlements;
Expand All @@ -4658,7 +4642,7 @@
INFOPLIST_KEY_CFBundleDisplayName = Share;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
IS_QA_BUILD =
IS_QA_BUILD = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -4682,7 +4666,7 @@
35C9B8212B5E8AA90062D787 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
APP_VERSION_IDENTIFIER =
APP_VERSION_IDENTIFIER = 1.12.3;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_ENTITLEMENTS = Share/Share.entitlements;
Expand All @@ -4698,7 +4682,7 @@
INFOPLIST_KEY_CFBundleDisplayName = Share;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
IS_QA_BUILD =
IS_QA_BUILD = NO;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -4722,7 +4706,7 @@
35C9B8222B5E8AA90062D787 /* Release-Beta */ = {
isa = XCBuildConfiguration;
buildSettings = {
APP_VERSION_IDENTIFIER =
APP_VERSION_IDENTIFIER = 1.12.3;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_ENTITLEMENTS = Share/Share.entitlements;
Expand All @@ -4738,7 +4722,7 @@
INFOPLIST_KEY_CFBundleDisplayName = Share;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
IS_QA_BUILD =
IS_QA_BUILD = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ This repository contains the source code for the Proton Pass iOS application.

The app targets iOS 16 and above. Make sure you have Xcode 15+ installed, check out the repo and open `ProtonPass.xcodeproj` to run the project.

You will need to build PassRustCore to be able to build the project.
The instruction to do that is located in the [Proton Pass Common Project](https://github.com/protonpass/proton-pass-common)

# Technical Choices

## UI
Expand Down
8 changes: 4 additions & 4 deletions Share/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>APP_VERSION_IDENTIFIER =
<string>$(APP_VERSION_IDENTIFIER =
<key>IS_QA_BUILD =
<string>$(IS_QA_BUILD =
<key>APP_VERSION_IDENTIFIER</key>
<string>$(APP_VERSION_IDENTIFIER)</string>
<key>IS_QA_BUILD</key>
<string>$(IS_QA_BUILD)</string>
<key>MODULE</key>
<string>SHARE_EXTENSION</string>
<key>NSExtension</key>
Expand Down
12 changes: 6 additions & 6 deletions iOS/App/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,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>APP_VERSION_IDENTIFIER =
<string>$(APP_VERSION_IDENTIFIER =
<key>APP_VERSION_IDENTIFIER</key>
<string>$(APP_VERSION_IDENTIFIER)</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
Expand All @@ -19,10 +19,10 @@
</array>
<key>GIT_COMMIT_HASH</key>
<string></string>
<key>IS_BETA_BUILD =
<string>$(IS_BETA_BUILD =
<key>IS_QA_BUILD =
<string>$(IS_QA_BUILD =
<key>IS_BETA_BUILD</key>
<string>$(IS_BETA_BUILD)</string>
<key>IS_QA_BUILD</key>
<string>$(IS_QA_BUILD)</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>ITSEncryptionExportComplianceCode</key>
Expand Down