Fixes for iOS build. Add moonpay api placeholders for secrets.

M committed Dec 28, 2021 at 19:00 UTC fa2302f9dff5251dfe4280984dc3b4df475e1def
4 files changed +19 -6
scripts/ios/build_monero.sh
+4 -4
@@ -49,13 +49,13 @@ cmake -D IOS=ON \
49 -DUSE_DEVICE_TREZOR=OFF \
50 ../..
51 make -j4 && make install
52 -cp external/randomx/librandomx.a ${DEST_LIB}
53 -cp src/cryptonote_basic/libcryptonote_basic.a ${DEST_LIB}
54 -cp src/cryptonote_basic/libcryptonote_format_utils_basic.a ${DEST_LIB}
52 +cp external/randomx/librandomx.a ${DEST_LIB}/
53 +cp src/cryptonote_basic/libcryptonote_basic.a ${DEST_LIB}/
54 +cp src/cryptonote_basic/libcryptonote_format_utils_basic.a ${DEST_LIB}/
55 popd
56
57 done
58
59 #only for arm64
60 cp ${MONERO_DIR_PATH}/lib-armv8-a/* $EXTERNAL_IOS_LIB_DIR
61 -cp ${MONERO_DIR_PATH}/include/wallet/api/* $EXTERNAL_IOS_INCLUDE_DIR
\ No newline at end of file
61 +cp ${MONERO_DIR_PATH}/include/wallet/api/* $EXTERNAL_IOS_INCLUDE_DIR
scripts/ios/build_zmq.sh
+9 -2
@@ -1,4 +1,4 @@
1 -#!/bin/sh
1 +g#!/bin/sh
2
3 . ./config.sh
4
@@ -9,5 +9,12 @@ echo "============================ ZMQ ============================"
9
10 echo "Cloning ZMQ from - $ZMQ_URL"
11 git clone $ZMQ_URL $ZMQ_PATH
12 +cd $ZMQ_PATH
13 +mkdir cmake-build
14 +cd cmake-build
15 +cmake ..
16 +make
17
13 -cp ${ZMQ_PATH}/include/* $EXTERNAL_IOS_INCLUDE_DIR
\ No newline at end of file
18 +
19 +cp ${ZMQ_PATH}/include/* $EXTERNAL_IOS_INCLUDE_DIR
20 +cp ${ZMQ_PATH}/cmake-build/lib/libzmq.a $EXTERNAL_IOS_LIB_DIR
scripts/ios/install_missing_headers.sh
+4
@@ -27,6 +27,10 @@ if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOTypes.h ]; then
27 cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/IOTypes.h ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOTypes.h
28 fi
29
30 +if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOMapTypes.h ]; then
31 + cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/IOMapTypes.h ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOMapTypes.h
32 +fi
33 +
34 if [ ! -f ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOKitLib.h ]; then
35 cp /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/Headers/IOKitLib.h ${EXTERNAL_IOS_INCLUDE_DIR}/IOKit/IOKitLib.h
36 fi
tool/utils/secret_key.dart
+2
@@ -21,6 +21,8 @@ class SecretKey {
21 SecretKey('wyreSecretKey', () => ''),
22 SecretKey('wyreApiKey', () => ''),
23 SecretKey('wyreAccountId', () => ''),
24 + SecretKey('moonPayApiKey', () => ''),
25 + SecretKey('moonPaySecretKey', () => ''),
26 ];
27
28 final String name;