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.

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

Local dev env polish #197

Merged
merged 4 commits into from
Dec 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions App/BabylonWallet.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
D5B1769E29267C1F00AAE13B /* AppIcon.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = AppIcon.xcassets; sourceTree = "<group>"; };
E667FFD128F6F7E50015544F /* Babylon */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Babylon; path = ..; sourceTree = "<group>"; };
E6805BBD286DB3EC00861180 /* WalletApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletApp.swift; sourceTree = "<group>"; };
E6805BC4286DB3ED00861180 /* δ-Radix Wallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "δ-Radix Wallet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
E6805BCA286DB3ED00861180 /* δ-Radix Wallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "δ-Radix Wallet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
E6805BC4286DB3ED00861180 /* Radix Wallet Dev.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Radix Wallet Dev.app"; sourceTree = BUILT_PRODUCTS_DIR; };
E6805BCA286DB3ED00861180 /* Radix Wallet Dev.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Radix Wallet Dev.app"; sourceTree = BUILT_PRODUCTS_DIR; };
E6805BCC286DB3ED00861180 /* macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = macOS.entitlements; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -138,8 +138,8 @@
E6805BC5286DB3ED00861180 /* Products */ = {
isa = PBXGroup;
children = (
E6805BC4286DB3ED00861180 /* δ-Radix Wallet.app */,
E6805BCA286DB3ED00861180 /* δ-Radix Wallet.app */,
E6805BC4286DB3ED00861180 /* Radix Wallet Dev.app */,
E6805BCA286DB3ED00861180 /* Radix Wallet Dev.app */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -188,7 +188,7 @@
E6805BDE286DB74300861180 /* AppFeature */,
);
productName = "Wallet (iOS)";
productReference = E6805BC4286DB3ED00861180 /* δ-Radix Wallet.app */;
productReference = E6805BC4286DB3ED00861180 /* Radix Wallet Dev.app */;
productType = "com.apple.product-type.application";
};
E6805BC9286DB3ED00861180 /* Radix Wallet (macOS) */ = {
Expand All @@ -209,7 +209,7 @@
E667FFD228F6F7ED0015544F /* AppFeature */,
);
productName = "Wallet (macOS)";
productReference = E6805BCA286DB3ED00861180 /* δ-Radix Wallet.app */;
productReference = E6805BCA286DB3ED00861180 /* Radix Wallet Dev.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Dev"
buildConfiguration = "Debug-Dev"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
Expand Down Expand Up @@ -391,7 +391,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Dev"
buildConfiguration = "Debug-Dev"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
Expand All @@ -412,7 +412,7 @@
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
buildConfiguration = "Debug-Dev"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
Expand All @@ -429,10 +429,10 @@
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Dev">
buildConfiguration = "Debug-Dev">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
buildConfiguration = "Debug-Dev"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
3 changes: 0 additions & 3 deletions App/Config/Common.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,5 @@ APP_ICON = AppIcon
/// Application's base name
APP_NAME = Radix Wallet

/// Application's base bundle id
APP_BUNDLE_ID = com.radixpublishing.radixwallet

/// Application's dev team id
DEV_TEAM = MDH99V28LM
12 changes: 1 addition & 11 deletions App/Config/Project/Project-Alpha.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,4 @@ ASSETCATALOG_COMPILER_APPICON_NAME = $(APP_ICON).alpha
// Product name
//
// This is the basename of the product generated by the target.
PRODUCT_NAME = α-$(APP_NAME)



// Bundle Display Name
//
// When `GENERATE_INFOPLIST_FILE` is enabled, sets the value of the
// [CFBundleDisplayName](https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundledisplayname)
// key in the Info.plist file to the value of this build setting.

INFOPLIST_KEY_CFBundleDisplayName = $(PRODUCT_NAME)
PRODUCT_NAME = $(APP_NAME) Alpha
10 changes: 0 additions & 10 deletions App/Config/Project/Project-Beta.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,3 @@ ASSETCATALOG_COMPILER_APPICON_NAME = $(APP_ICON).beta
// This is the basename of the product generated by the target.

PRODUCT_NAME = $(APP_NAME)



// Bundle Display Name
//
// When `GENERATE_INFOPLIST_FILE` is enabled, sets the value of the
// [CFBundleDisplayName](https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundledisplayname)
// key in the Info.plist file to the value of this build setting.

INFOPLIST_KEY_CFBundleDisplayName = $(PRODUCT_NAME)
11 changes: 1 addition & 10 deletions App/Config/Project/Project-Dev.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = $(APP_ICON).dev
// Product name
//
// This is the basename of the product generated by the target.
PRODUCT_NAME = δ-$(APP_NAME)
PRODUCT_NAME = $(APP_NAME) Dev



// Bundle Display Name
//
// When `GENERATE_INFOPLIST_FILE` is enabled, sets the value of the
// [CFBundleDisplayName](https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundledisplayname)
// key in the Info.plist file to the value of this build setting.

INFOPLIST_KEY_CFBundleDisplayName = $(PRODUCT_NAME)


// MARK: - Debug optimization


Expand Down
7 changes: 7 additions & 0 deletions App/Config/Project/Project-Shared.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

#include "../common.xcconfig"

// Bundle Display Name
//
// When `GENERATE_INFOPLIST_FILE` is enabled, sets the value of the
// [CFBundleDisplayName](https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundledisplayname)
// key in the Info.plist file to the value of this build setting.

INFOPLIST_KEY_CFBundleDisplayName = $(APP_NAME)


// Marketing Version
Expand Down
2 changes: 1 addition & 1 deletion App/Config/macOS/macOS-shared.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// the hyphen (`-`). This value is used as the `CFBundleIdentifier` in the `Info.plist`
// of the built bundle.

PRODUCT_BUNDLE_IDENTIFIER = $(APP_BUNDLE_ID).macos
PRODUCT_BUNDLE_IDENTIFIER = com.radixpublishing.radixwallet.macos.dev



Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed PREVIEW.png
Diff not rendered.
5 changes: 2 additions & 3 deletions fastlane/.env.mac
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
SCHEME='Wallet (macOS)'
APP_IDENTIFIER="com.radixpublishing.radixwallet.macos.dev"
MATCH_APP_IDENTIFIER=${APP_IDENTIFIER}
XCCONFIG_PATH="./App/Config/macOS/macOS-shared.xcconfig"
SCHEME='Radix Wallet (macOS)'

SCAN_SCHEME=${SCHEME}