Skip to content

Commit 153aa95

Browse files
Merge branch 'staging' into docs
2 parents e84f705 + 6ba34c6 commit 153aa95

323 files changed

Lines changed: 51922 additions & 46824 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
[submodule "crypto_plugins/frostdart"]
55
path = crypto_plugins/frostdart
66
url = https://github.com/cypherstack/frostdart
7+
[submodule "crypto_plugins/flutter_libmwc"]
8+
path = crypto_plugins/flutter_libmwc
9+
url = https://github.com/cypherstack/flutter_libmwc

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Highlights include:
1919
- [Dash](https://www.dash.org/)
2020
- [Dogecoin](https://dogecoin.com/)
2121
- [Epic Cash](https://linktr.ee/epiccash)
22+
- [MimbleWimbleCoin](https://mwc.mw)
2223
- [Ethereum](https://ethereum.org/en/)
2324
- [Ecash](https://e.cash/)
2425
- [Fact0rn](https://www.fact0rn.io/)

android/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ gradle-wrapper.jar
77
/key.properties
88
app/upload-keystore-campfire.jks
99
app/upload-keystore-stackwallet.jks
10-
GeneratedPluginRegistrant.java
10+
GeneratedPluginRegistrant.java
11+
/.kotlin/

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pluginManagement {
1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2121
id "com.android.application" version '8.7.0' apply false
22-
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
22+
id "org.jetbrains.kotlin.android" version "2.2.20" apply false
2323
}
2424

2525
include ":app"

crypto_plugins/flutter_libepiccash

crypto_plugins/flutter_libmwc

Submodule flutter_libmwc added at a692b7d

ios/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
**/dgph
12
*.mode1v3
23
*.mode2v3
34
*.moved-aside
@@ -18,6 +19,7 @@ Flutter/App.framework
1819
Flutter/Flutter.framework
1920
Flutter/Flutter.podspec
2021
Flutter/Generated.xcconfig
22+
Flutter/ephemeral/
2123
Flutter/app.flx
2224
Flutter/app.zip
2325
Flutter/flutter_assets/
@@ -33,3 +35,5 @@ Runner/GeneratedPluginRegistrant.*
3335

3436
# app specific, handled by scripts
3537
Runner/Assets.xcassets/LaunchImage.imageset/*.png
38+
/Flutter/ephemeral/flutter_lldb_helper.py
39+
/Flutter/ephemeral/flutter_lldbinit

lib/app_config.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// ignore: unused_import
2+
import 'dart:io';
3+
14
import 'wallets/crypto_currency/crypto_currency.dart';
25
import 'wallets/crypto_currency/intermediate/frost_currency.dart';
36

lib/db/db_version_migration.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*/
1010

11-
import 'package:isar/isar.dart';
11+
import 'package:isar_community/isar.dart';
1212
import 'package:tuple/tuple.dart';
1313

1414
import '../app_config.dart';

0 commit comments

Comments
 (0)