Change target sdk version to 30 for android project. Remove unused files.

M committed Jan 13, 2022 at 16:12 UTC 8b043f1a20241ebf00f4c0a9dec80278e20bbc70
6 files changed +72 -90
android/app/build.gradle
+1 -1
@@ -46,7 +46,7 @@ android {
46 defaultConfig {
47 applicationId appProperties['id']
48 minSdkVersion 21
49 - targetSdkVersion 29
49 + targetSdkVersion 30
50 versionCode flutterVersionCode.toInteger()
51 versionName flutterVersionName
52 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
cw_bitcoin/pubspec.lock
+65 -5
@@ -29,6 +29,38 @@ packages:
29 url: "https://pub.dartlang.org"
30 source: hosted
31 version: "2.5.0"
32 + bech32:
33 + dependency: transitive
34 + description:
35 + path: "."
36 + ref: cake
37 + resolved-ref: "02fef082f20af13de00b4e64efb93a2c1e5e1cf2"
38 + url: "https://github.com/cake-tech/bech32.git"
39 + source: git
40 + version: "0.2.0"
41 + bip32:
42 + dependency: transitive
43 + description:
44 + name: bip32
45 + url: "https://pub.dartlang.org"
46 + source: hosted
47 + version: "1.0.7"
48 + bip39:
49 + dependency: transitive
50 + description:
51 + name: bip39
52 + url: "https://pub.dartlang.org"
53 + source: hosted
54 + version: "1.0.3"
55 + bitcoin_flutter:
56 + dependency: "direct main"
57 + description:
58 + path: "."
59 + ref: cake
60 + resolved-ref: cbabfd87b6ce3cae6051a3e86ddb56e7a934e188
61 + url: "https://github.com/cake-tech/bitcoin_flutter.git"
62 + source: git
63 + version: "2.0.2"
64 boolean_selector:
65 dependency: transitive
66 description:
@@ -36,6 +68,13 @@ packages:
68 url: "https://pub.dartlang.org"
69 source: hosted
70 version: "2.1.0"
71 + bs58check:
72 + dependency: transitive
73 + description:
74 + name: bs58check
75 + url: "https://pub.dartlang.org"
76 + source: hosted
77 + version: "1.0.1"
78 build:
79 dependency: transitive
80 description:
@@ -147,14 +186,14 @@ packages:
186 name: convert
187 url: "https://pub.dartlang.org"
188 source: hosted
150 - version: "3.0.1"
189 + version: "2.1.1"
190 crypto:
191 dependency: transitive
192 description:
193 name: crypto
194 url: "https://pub.dartlang.org"
195 source: hosted
157 - version: "3.0.1"
196 + version: "2.1.5"
197 cw_core:
198 dependency: "direct main"
199 description:
@@ -175,7 +214,7 @@ packages:
214 name: dartx
215 url: "https://pub.dartlang.org"
216 source: hosted
178 - version: "0.8.0"
217 + version: "0.5.0"
218 fake_async:
219 dependency: transitive
220 description:
@@ -235,13 +274,20 @@ packages:
274 url: "https://pub.dartlang.org"
275 source: hosted
276 version: "0.2.0"
277 + hex:
278 + dependency: transitive
279 + description:
280 + name: hex
281 + url: "https://pub.dartlang.org"
282 + source: hosted
283 + version: "0.1.2"
284 hive:
285 dependency: transitive
286 description:
287 name: hive
288 url: "https://pub.dartlang.org"
289 source: hosted
244 - version: "1.6.0-nullsafety.2"
290 + version: "1.4.4+1"
291 hive_generator:
292 dependency: "direct dev"
293 description:
@@ -410,6 +456,13 @@ packages:
456 url: "https://pub.dartlang.org"
457 source: hosted
458 version: "1.0.3"
459 + pointycastle:
460 + dependency: transitive
461 + description:
462 + name: pointycastle
463 + url: "https://pub.dartlang.org"
464 + source: hosted
465 + version: "1.0.2"
466 pool:
467 dependency: transitive
468 description:
@@ -438,6 +491,13 @@ packages:
491 url: "https://pub.dartlang.org"
492 source: hosted
493 version: "0.1.8"
494 + rxdart:
495 + dependency: "direct main"
496 + description:
497 + name: rxdart
498 + url: "https://pub.dartlang.org"
499 + source: hosted
500 + version: "0.26.0"
501 shelf:
502 dependency: transitive
503 description:
@@ -519,7 +579,7 @@ packages:
579 name: time
580 url: "https://pub.dartlang.org"
581 source: hosted
522 - version: "2.1.0"
582 + version: "1.4.1"
583 timing:
584 dependency: transitive
585 description:
cw_bitcoin/pubspec.yaml
+6 -1
@@ -18,7 +18,12 @@ dependencies:
18 intl: ^0.17.0
19 cw_core:
20 path: ../cw_core
21 -
21 + bitcoin_flutter:
22 + git:
23 + url: https://github.com/cake-tech/bitcoin_flutter.git
24 + ref: cake
25 + rxdart: ^0.26.0
26 +
27 dev_dependencies:
28 flutter_test:
29 sdk: flutter
lib/entities/wallet.dart deleted
-61
@@ -1,61 +0,0 @@
1 -//import 'package:mobx/mobx.dart';
2 -//import 'package:cw_core/sync_status.dart';
3 -//import 'package:cake_wallet/entities/transaction_history.dart';
4 -//import 'package:cw_core/wallet_type.dart';
5 -//import 'package:cake_wallet/entities/transaction_creation_credentials.dart';
6 -//import 'package:cake_wallet/entities/pending_transaction.dart';
7 -//import 'package:cw_core/balance.dart';
8 -//import 'package:cw_core/node.dart';
9 -
10 -//abstract class Wallet {
11 -// WalletType getType();
12 -
13 -// WalletType walletType;
14 -
15 -// Observable<Balance> onBalanceChange;
16 -
17 -// Observable<SyncStatus> syncStatus;
18 -
19 -// Observable<String> get onNameChange;
20 -
21 -// Observable<String> get onAddressChange;
22 -
23 -// String get name;
24 -
25 -// String get address;
26 -
27 -// Future updateInfo();
28 -
29 -// Future<String> getFilename();
30 -
31 -// Future<String> getName();
32 -
33 -// Future<String> getAddress();
34 -
35 -// Future<String> getSeed();
36 -
37 -// Future<Map<String, String>> getKeys();
38 -
39 -// Future<String> getFullBalance();
40 -
41 -// Future<String> getUnlockedBalance();
42 -
43 -// Future<int> getCurrentHeight();
44 -
45 -// Future<int> getNodeHeight();
46 -
47 -// Future<bool> isConnected();
48 -
49 -// Future close();
50 -
51 -// TransactionHistory getHistory();
52 -
53 -// Future connectToNode({Node node, bool useSSL = false, bool isLightWallet = false});
54 -
55 -// Future startSync();
56 -
57 -// Future<PendingTransaction> createTransaction(
58 -// TransactionCreationCredentials credentials);
59 -
60 -// Future rescan({int restoreHeight = 0});
61 -//}
lib/entities/wallets_manager.dart deleted
-18
@@ -1,18 +0,0 @@
1 -import 'package:cake_wallet/entities/wallet.dart';
2 -import 'package:cake_wallet/entities/wallet_description.dart';
3 -
4 -abstract class WalletsManager {
5 - Future<Wallet> create(String name, String password, String language);
6 -
7 - Future<Wallet> restoreFromSeed(
8 - String name, String password, String seed, int restoreHeight);
9 -
10 - Future<Wallet> restoreFromKeys(String name, String password, String language,
11 - int restoreHeight, String address, String viewKey, String spendKey);
12 -
13 - Future<Wallet> openWallet(String name, String password);
14 -
15 - Future<bool> isWalletExit(String name);
16 -
17 - Future remove(WalletDescription wallet);
18 -}
\ No newline at end of file
pubspec_base.yaml
-4
@@ -45,10 +45,6 @@ dependencies:
45 crypto: ^2.1.5
46 password: ^1.0.0
47 basic_utils: ^2.0.3
48 - bitcoin_flutter:
49 - git:
50 - url: https://github.com/cake-tech/bitcoin_flutter.git
51 - ref: cake
48 get_it: ^6.0.0
49 connectivity: ^3.0.3
50 keyboard_actions: ^3.3.0