From 224016d39e1c76c9bf26fd3016aa04cdc3e29f83 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Tue, 21 Dec 2021 13:35:25 +0100
Subject: [PATCH] Upgrade gradle version
---
android/app/build.gradle | 6 +++---
android/build.gradle | 2 +-
android/gradle/wrapper/gradle-wrapper.properties | 2 +-
lib/screens/myWallets/import_cesium_wallet.dart | 2 +-
pubspec.lock | 7 -------
pubspec.yaml | 4 ++--
6 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index a1989bf0..55d3b2d2 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
}
android {
- compileSdkVersion 29
+ compileSdkVersion 30
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
@@ -44,9 +44,9 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.example.gecko"
+ applicationId "gecko.axiomteam.fr"
minSdkVersion 16
- targetSdkVersion 29
+ targetSdkVersion 30
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
diff --git a/android/build.gradle b/android/build.gradle
index 3100ad2d..dc5cdbc9 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.5.0'
+ classpath 'com.android.tools.build:gradle:4.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 296b146b..493072b3 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/lib/screens/myWallets/import_cesium_wallet.dart b/lib/screens/myWallets/import_cesium_wallet.dart
index 1341ba25..cf39795f 100644
--- a/lib/screens/myWallets/import_cesium_wallet.dart
+++ b/lib/screens/myWallets/import_cesium_wallet.dart
@@ -56,7 +56,7 @@ class ImportWalletScreen extends StatelessWidget {
if (_debounce?.isActive ?? false) {
_debounce.cancel();
}
- _debounce = Timer(const Duration(milliseconds: 200), () {
+ _debounce = Timer(const Duration(milliseconds: 600), () {
walletProvider
.generateCesiumWalletPubkey(
text, walletProvider.cesiumPWD.text)
diff --git a/pubspec.lock b/pubspec.lock
index 6f33c900..8d8688f2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -927,13 +927,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
- qr_code_scanner:
- dependency: "direct main"
- description:
- name: qr_code_scanner
- url: "https://pub.dartlang.org"
- source: hosted
- version: "0.6.1"
qr_flutter:
dependency: "direct main"
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 872d21cd..010b65a9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,7 +5,7 @@ description: Pay with G1.
# pub.dev using `pub publish`. This is preferred for private packages.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-version: 0.0.4+2
+version: 0.0.4+3
environment:
sdk: ">=2.7.0 <3.0.0"
@@ -47,7 +47,7 @@ dependencies:
printing: ^5.6.0
provider: ^6.0.1
qrscan: ^0.3.2
- qr_code_scanner: ^0.6.1
+ # qr_code_scanner: ^0.6.1
qr_flutter: ^4.0.0
responsive_builder: ^0.4.1
responsive_framework: ^0.1.4
--
GitLab