Skip to content

Commit 56c0f2c

Browse files
committed
Merge remote-tracking branch 'benma/ios'
2 parents e1a972f + a87389e commit 56c0f2c

File tree

29 files changed

+1171
-7
lines changed

29 files changed

+1171
-7
lines changed

backend/mobileserver/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/mobileserver-sources.jar
22
/mobileserver.aar
3+
/Mobileserver.xcframework

backend/mobileserver/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@ include ../../android-env.mk.inc
55
# by turning off GO111MODULE. See also: https://github.com/golang/go/issues/34181#issuecomment-640260162
66
build-android:
77
GO111MODULE=off ANDROID_HOME=${ANDROID_SDK_ROOT} gomobile bind -x -a -ldflags="-s -w" -target android .
8+
build-ios:
9+
GO111MODULE=off gomobile bind -x -a -ldflags="-s -w" -target ios,iossimulator .
810
clean:
911
rm -f mobileserver.aar mobileserver-sources.jar

docs/BUILD.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,20 @@ After connecting the device via USB, it is possible to verify the connection wit
118118

119119
Inside `frontends/android` folder: `make deploy-debug`
120120

121+
## iOS
122+
123+
The instructions here are preliminary, as the iOS app is still in development.
124+
125+
To build the app and run it in the simulator:
126+
127+
cd frontends/ios
128+
make prepare
129+
130+
131+
Open XCode, load the project in /frontends/ios/BitBoxApp/BitBoxApp.xcodeproj.
132+
133+
In the menu, hit Project->Run (or ⌘R).
134+
121135
### Deploy troubleshooting
122136
If the apk install goes wrong, here are some Android configuration that could help:
123137
* Enable developer options

frontends/ios/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
xcuserdata
2+
/BitBoxApp/BitBoxApp/assets/web/

0 commit comments

Comments
 (0)