Skip to content

Commit a8b36bd

Browse files
MrCyjaneKMrCyjaneK
committed
updates, fixes and more
fix: warnings on malicious inputs chore: bump flutter to 3.41.2 fix: ios builds on linux, android builds on mac chore: bump sdk chore: bump monero_c chore: bump all pubspec.yaml fix: LTC mweb, use passphrase
1 parent 7a8754a commit a8b36bd

28 files changed

Lines changed: 1662 additions & 256 deletions

‎.env‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
MONERO_C_TAG=v0.18.4.0-RC7
2-
COIN=monero
1+
MONERO_C_TAG=99aa531f9c7180805e59dd52f6dde95d5c55ab0d
2+
MONERO_C_PREBUILD_TAG=v0.18.4.6-RC2
3+
COIN=monero

‎.fvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"flutter": "3.32.0"
2+
"flutter": "3.41.9"
33
}

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,6 @@ missing_translations.txt
5252

5353
# FVM Version Cache
5454
.fvm/
55-
*.g.dart
55+
*.g.dart
56+
57+
android/.kotlin/sessions/*.salive

‎.vscode/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"dart.flutterSdkPath": ".fvm/versions/3.32.0"
2+
"dart.flutterSdkPath": ".fvm/versions/3.41.9"
33
}

‎Makefile‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
include .env
22
UNAME := $(shell uname)
3+
MONERO_C_PREBUILD_TAG ?= $(MONERO_C_TAG)
4+
5+
all: libs_android_build libs_ios_build prepare_dev
6+
7+
init:
8+
git submodule update --init --recursive
39

410
libs_android_download: mwebd_android
5-
./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --triplet x86_64-linux-android --location android/app/src/main/jniLibs/x86_64
6-
./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-linux-android --location android/app/src/main/jniLibs/arm64-v8a
7-
./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --triplet armv7a-linux-androideabi --location android/app/src/main/jniLibs/armeabi-v7a
11+
./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --prebuild-tag ${MONERO_C_PREBUILD_TAG} --triplet x86_64-linux-android --location android/app/src/main/jniLibs/x86_64
12+
./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --prebuild-tag ${MONERO_C_PREBUILD_TAG} --triplet aarch64-linux-android --location android/app/src/main/jniLibs/arm64-v8a
13+
./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --prebuild-tag ${MONERO_C_PREBUILD_TAG} --triplet armv7a-linux-androideabi --location android/app/src/main/jniLibs/armeabi-v7a
814

915
libs_android_build: mwebd_android
10-
ifneq ($(UNAME), Linux)
11-
echo Only Linux hosts can build for android, try $(MAKE) libs_android_download
12-
exit 1
13-
endif
1416
./build_moneroc.sh --coin ${COIN} --tag ${MONERO_C_TAG} --triplet x86_64-linux-android --location android/app/src/main/jniLibs/x86_64
1517
./build_moneroc.sh --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-linux-android --location android/app/src/main/jniLibs/arm64-v8a
1618
./build_moneroc.sh --coin ${COIN} --tag ${MONERO_C_TAG} --triplet armv7a-linux-androideabi --location android/app/src/main/jniLibs/armeabi-v7a
@@ -19,17 +21,13 @@ libs_android_build_ci: mwebd_android
1921
./build_moneroc.sh --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-linux-android --location android/app/src/main/jniLibs/arm64-v8a
2022

2123
libs_ios_download: mwebd_ios
22-
./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-apple-ios --location ios/native_libs/ios-arm64
23-
./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-apple-iossimulator --location ios/native_libs/ios-arm64-simulator
24+
./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --prebuild-tag ${MONERO_C_PREBUILD_TAG} --triplet aarch64-apple-ios --location ios/native_libs/ios-arm64
25+
./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --prebuild-tag ${MONERO_C_PREBUILD_TAG} --triplet aarch64-apple-ios-simulator --location ios/native_libs/ios-arm64-simulator
2426
cd ios && ./gen_framework.sh
2527

2628
libs_ios_build: mwebd_ios
27-
ifneq ($(UNAME), Darwin)
28-
echo Only Darwin hosts can build for iOS, try $(MAKE) libs_ios_download
29-
exit 1
30-
endif
3129
./build_moneroc.sh --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-apple-ios --location ios/native_libs/ios-arm64
32-
./build_moneroc.sh --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-apple-iossimulator --location ios/native_libs/ios-arm64-simulator
30+
./build_moneroc.sh --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-apple-ios-simulator --location ios/native_libs/ios-arm64-simulator
3331
cd ios && ./gen_framework.sh
3432

3533
cupcake_android:

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
To build:
88

99
```bash
10-
$ make libs_android_build # or libs_android_download, libs_ios_build, libs_ios_download
11-
$ make prepare_dev # load dev signing key (not required on iOS)
10+
$ make init # fetch the submodules
11+
$ make all # or libs_android_build, libs_android_download, libs_ios_build, libs_ios_download
12+
$ make prepare_dev # not needed if ran `make all`
1213
$ make cupcake_android # or cupcake_ios
1314
```
1415

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ android {
5151
applicationId "com.cakewallet.cupcake"
5252
// You can update the following values to match your application needs.
5353
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
54-
minSdkVersion 23
54+
minSdkVersion flutter.minSdkVersion
5555
targetSdkVersion 36
5656
versionCode flutterVersionCode.toInteger()
5757
versionName flutterVersionName

‎android/app/src/main/jniLibs/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libmonero_libwallet2_api_c.so
1+
libmonero_*wallet2_api_c.so

‎android/gradle.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
org.gradle.jvmargs=-Xmx4G
1+
org.gradle.jvmargs=-Xmx6G
22
android.useAndroidX=true
33
android.enableJetifier=true
4+
android.ndk.suppressMinSdkVersionError=21

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

0 commit comments

Comments
 (0)