Skip to content

Techdebt/add private submodule 175 #62

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

Merged
kcw-grunt merged 10 commits into from
Aug 15, 2025
Merged

Techdebt/add private submodule 175 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a2f5663
📸 Reorganized test structure Added Screenshots (#61)
kcw-grunt Jul 29, 2025
0626b63
Set desired ios-games commit
kcw-grunt Aug 15, 2025
6a39ac8
Reset and added the 2 projects
kcw-grunt Aug 15, 2025
4bf298d
Set a private filter in gitignore
kcw-grunt Aug 15, 2025
5f7e130
Update ios-games commit
kcw-grunt Aug 15, 2025
d809835
updated ios games
kcw-grunt Aug 15, 2025
31731b4
removed storekit file and ios-games submodules
kcw-grunt Aug 15, 2025
bdda7c3
Update README.md
kcw-grunt Aug 15, 2025
bce8cf9
Merge branch 'develop' into techdebt/add-private-submodule-175
kcw-grunt Aug 15, 2025
5143edf
update workspace
kcw-grunt Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 4 additions & 9 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
echo 'github.com ssh-rsa SHA256:Z4bsDPFhTv8vuTERTBcs6b5RHFRspyI77b7tQUsju1g' >> ~/.ssh/known_hosts
ssh-add -D
ssh-add ~/.ssh/id_rsa_*
git submodule init && git submodule update --init --recursive
git submodule init && git submodule update --init Modules/core

# Setup environment files (MUST be before build)
- run:
Expand Down Expand Up @@ -290,20 +290,18 @@ jobs:
echo "Running daily health check build..."

# Setup environment files for build check
echo 'export BRAINWALLET_IOS_STOREKIT_V1_0_FILE="$BRAINWALLET_IOS_STOREKIT_V1_0_FILE"' >> $BASH_ENV
echo 'export GOOGLE_SERVICES_PLIST="$GOOGLE_SERVICES_PLIST"' >> $BASH_ENV
echo 'export REMOTE_CONFIG_DEFAULTS="$REMOTE_CONFIG_DEFAULTS"' >> $BASH_ENV
echo 'export DEBUG_SERVICE_DATA="$DEBUG_SERVICE_DATA"' >> $BASH_ENV

# Create minimal environment files for build verification
echo "$BRAINWALLET_IOS_STOREKIT_V1_0_FILE" | base64 --decode > Brainwallet-StoreKit-v1.storekit
echo "$GOOGLE_SERVICES_PLIST" | base64 --decode > GoogleService-Info.plist
echo "$REMOTE_CONFIG_DEFAULTS" | base64 --decode > remote-config-defaults.plist
echo "$DEBUG_SERVICE_DATA" | base64 --decode > service-data.plist

# Copy to brainwallet directory
mkdir -p ./brainwallet
cp *.storekit *.plist ./brainwallet/ 2>/dev/null || echo "Some files may not exist"
cp *.plist ./brainwallet/ 2>/dev/null || echo "Some files may not exist"

# Quick build verification (build only, no tests)
xcodebuild build \
Expand Down Expand Up @@ -392,20 +390,18 @@ jobs:
echo 'github.com ssh-rsa SHA256:Z4bsDPFhTv8vuTERTBcs6b5RHFRspyI77b7tQUsju1g' >> ~/.ssh/known_hosts
ssh-add -D
ssh-add ~/.ssh/id_rsa_*
git submodule init && git submodule update --init --recursive
git submodule init && git submodule update --init Modules/core

# Setup environment files (MUST be before build)
- run:
name: Setup environment files
command: |
# Export environment variables
echo 'export BRAINWALLET_IOS_STOREKIT_V1_0_FILE="$BRAINWALLET_IOS_STOREKIT_V1_0_FILE"' >> $BASH_ENV
echo 'export GOOGLE_SERVICES_PLIST="$GOOGLE_SERVICES_PLIST"' >> $BASH_ENV
echo 'export REMOTE_CONFIG_DEFAULTS="$REMOTE_CONFIG_DEFAULTS"' >> $BASH_ENV
echo 'export DEBUG_SERVICE_DATA="$DEBUG_SERVICE_DATA"' >> $BASH_ENV

# Create environment files in root directory (required by Xcode build)
echo "$BRAINWALLET_IOS_STOREKIT_V1_0_FILE" | base64 --decode > Brainwallet-StoreKit-v1.storekit
echo "$GOOGLE_SERVICES_PLIST" | base64 --decode > GoogleService-Info.plist
echo "$REMOTE_CONFIG_DEFAULTS" | base64 --decode > remote-config-defaults.plist
echo "$DEBUG_SERVICE_DATA" | base64 --decode > service-data.plist
Expand All @@ -432,7 +428,6 @@ jobs:

# Also copy to brainwallet directory if needed
mkdir -p ./brainwallet
cp Brainwallet-StoreKit-v1.storekit ./brainwallet/PreLaunchResources/
cp GoogleService-Info.plist ./brainwallet/PreLaunchResources/
cp remote-config-defaults.plist ./brainwallet/PreLaunchResources/
cp service-data.plist ./brainwallet/PreLaunchResources/
Expand Down
6 changes: 4 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,7 @@ GoogleService-Info.plist
/Storekit
*.storekit
Brainwallet-StoreKit-v1.storekit
fastlane/report.xml
fastlane/test_output/
/fastlane/report.xml
**/fastlane/test_output/
## Games protection
/Private
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "Modules/core"]
path = Modules/core
url = https://github.com/gruntsoftware/core.git
[submodule "Private/ios-games"]
path = Private/ios-games
url = https://github.com/gruntsoftware/ios-games.git
Copy link
Collaborator

@josikie josikie Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, in Android, there can be a a small apps inside the app. Do we integrate our game apps to our iOS wallet, or the games programs are directly inside the iOS app? @kcw-grunt

Copy link
Collaborator Author

@kcw-grunt kcw-grunt Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. You can view the similar repo for android that is internal. We need to make sure the process is similar @josikie

10 changes: 10 additions & 0 deletions BrainwalletHybrid.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Private/ios-games
Open in desktop
Submodule ios-games added at cc26da
8 changes: 2 additions & 6 deletions brainwallet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
244310462E21BCCE004AE386 /* clickseedword.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 244310452E21BCCE004AE386 /* clickseedword.mp3 */; };
244520342DE7031F003AFFDF /* LockScreenHostingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 244520332DE70310003AFFDF /* LockScreenHostingController.swift */; };
2446DF522E2906AC001453DF /* bloop.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 2446DF512E2906AC001453DF /* bloop.mp3 */; };
244895E32DF57D1900CA8BA2 /* Brainwallet-StoreKit-v1.storekit in Resources */ = {isa = PBXBuildFile; fileRef = 244895E22DF57D1900CA8BA2 /* Brainwallet-StoreKit-v1.storekit */; };
244A8D932DE84C890024D356 /* BrainwalletShapes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 244A8D922DE84C7F0024D356 /* BrainwalletShapes.swift */; };
245A91DC2DBA3E670048E3A6 /* PINRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 245A91DB2DBA3E450048E3A6 /* PINRowView.swift */; };
245F189C2DD1F28B00D20715 /* BuyViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 245F189B2DD1F27E00D20715 /* BuyViewModel.swift */; };
Expand Down Expand Up @@ -493,7 +492,6 @@
244310452E21BCCE004AE386 /* clickseedword.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = clickseedword.mp3; sourceTree = "<group>"; };
244520332DE70310003AFFDF /* LockScreenHostingController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockScreenHostingController.swift; sourceTree = "<group>"; };
2446DF512E2906AC001453DF /* bloop.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = bloop.mp3; sourceTree = "<group>"; };
244895E22DF57D1900CA8BA2 /* Brainwallet-StoreKit-v1.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = "Brainwallet-StoreKit-v1.storekit"; sourceTree = "<group>"; };
244A8D922DE84C7F0024D356 /* BrainwalletShapes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrainwalletShapes.swift; sourceTree = "<group>"; };
245A91DB2DBA3E450048E3A6 /* PINRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PINRowView.swift; sourceTree = "<group>"; };
245F189B2DD1F27E00D20715 /* BuyViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuyViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1623,7 +1621,6 @@
24D7EA032E336D0800A9AB68 /* CHANGELOG.md */,
24D7EA042E336D0800A9AB68 /* POSTBouncer.html */,
24E06FC42DF4790B00719B6C /* remote-config-defaults.plist */,
244895E22DF57D1900CA8BA2 /* Brainwallet-StoreKit-v1.storekit */,
2489E05B2DF0A23700630888 /* GoogleService-Info.plist */,
);
path = PreLaunchResources;
Expand Down Expand Up @@ -2292,7 +2289,6 @@
24D7EA0B2E336D0800A9AB68 /* CHANGELOG.md in Resources */,
24D7EA0E2E336F9100A9AB68 /* service-data.plist in Resources */,
24D7EA0C2E336D0800A9AB68 /* PrivacyInfo.xcprivacy in Resources */,
244895E32DF57D1900CA8BA2 /* Brainwallet-StoreKit-v1.storekit in Resources */,
24F5BD3C2E042A040010D340 /* clicksound.wav in Resources */,
C312D4B22D7DC27700BB97A4 /* SyncProgressHeaderView.xib in Resources */,
244310442E21BCBD004AE386 /* errorsound.mp3 in Resources */,
Expand Down Expand Up @@ -3075,7 +3071,7 @@
CODE_SIGN_ENTITLEMENTS = brainwallet/brainwallet.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 250727.1;
CURRENT_PROJECT_VERSION = 250815.0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = U8WDVUDC2P;
DOCC_EXTRACT_SWIFT_INFO_FOR_OBJC_SYMBOLS = YES;
Expand Down Expand Up @@ -3263,7 +3259,7 @@
CODE_SIGN_ENTITLEMENTS = brainwallet/brainwallet.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 250727.1;
CURRENT_PROJECT_VERSION = 250815.0;
DEVELOPMENT_TEAM = U8WDVUDC2P;
DOCC_EXTRACT_SWIFT_INFO_FOR_OBJC_SYMBOLS = YES;
EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
Expand Down
1 change: 0 additions & 1 deletion brainwallet/App Launch Classes/ApplicationController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import BackgroundTasks
import StoreKit
Copy link
Collaborator Author

@kcw-grunt kcw-grunt Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cleanup to ask for reviews

import SwiftUI
import UIKit

Expand Down
2 changes: 1 addition & 1 deletion brainwallet/Transactions Classes/TransactionsViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import StoreKit
import FirebaseAnalytics
import StoreKit

class TransactionsViewModel: ObservableObject, Subscriber, Trackable {

Expand Down
8 changes: 4 additions & 4 deletions fastlane/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do


Copy link
Collaborator Author

@kcw-grunt kcw-grunt Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops deleted test files...300 files of nothing.


### ios run_all_tests
### ios run_all_tests_iPhone15ProMax

```sh
[bundle exec] fastlane ios run_all_tests
[bundle exec] fastlane ios run_all_tests_iPhone15ProMax
```



### ios run_ui_iphone13mini_tests
### ios run_all_tests_iPhone13Mini

```sh
[bundle exec] fastlane ios run_ui_iphone13mini_tests
[bundle exec] fastlane ios run_all_tests_iPhone13Mini
```


Expand Down
33 changes: 0 additions & 33 deletions fastlane/report.xml
View file
Open in desktop

This file was deleted.

Loading