13700 update flutter 1.9

This commit is contained in:
nikitateplyakov
2020-02-27 22:23:31 +03:00
parent 09236e2518
commit a41b30f295
6 changed files with 48 additions and 60 deletions

View File

@@ -1,8 +1,8 @@
def localProperties = new Properties() def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties') def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) { if (localPropertiesFile.exists()) {
localPropertiesFile.withInputStream { stream -> localPropertiesFile.withReader('UTF-8') { reader ->
localProperties.load(stream) localProperties.load(reader)
} }
} }
@@ -48,6 +48,7 @@ android {
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
} }
release { release {
shrinkResources false
minifyEnabled false minifyEnabled false
signingConfig signingConfigs.release signingConfig signingConfigs.release
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

View File

@@ -6,7 +6,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.4.2' classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }

View File

@@ -1,3 +1,4 @@
android.enableJetifier=true android.enableJetifier=true
android.useAndroidX=true android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.enableR8=false

View File

@@ -1,19 +1,18 @@
import 'dart:async'; import 'dart:async';
import 'package:checker/db.dart'; import 'package:checker/db.dart';
import 'package:checker/screens/splash.dart';
import 'package:checker/strings.dart'; import 'package:checker/strings.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:checker/screens/splash.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:sentry/sentry.dart'; import 'package:sentry/sentry.dart';
const platform = const MethodChannel('com.dinect.checker/instance_id'); const platform = const MethodChannel('com.dinect.checker/instance_id');
main() { main() {
WidgetsFlutterBinding.ensureInitialized();
platform.invokeMethod('getFlavor').then((flavor) { platform.invokeMethod('getFlavor').then((flavor) {
platform.invokeMethod('getAppTitle').then((title) { platform.invokeMethod('getAppTitle').then((title) {
String app = flavor; // dinect, autobonus String app = flavor; // dinect, autobonus
String appName = title; // Dinect, Dinect (INT), Autobonus String appName = title; // Dinect, Dinect (INT), Autobonus
@@ -32,7 +31,8 @@ main() {
}); });
} }
initWithSystemValue(String app, String name, String locale, SqliteHelper helper) { initWithSystemValue(
String app, String name, String locale, SqliteHelper helper) {
helper.getSettings(false).then((settings) { helper.getSettings(false).then((settings) {
if (settings.isEmpty) { if (settings.isEmpty) {
createSettingsTable(app, name, helper); createSettingsTable(app, name, helper);
@@ -74,7 +74,6 @@ start(String app, String name, String locale, SqliteHelper helper) {
} }
class Checker extends StatefulWidget { class Checker extends StatefulWidget {
final SqliteHelper helper; final SqliteHelper helper;
final String app; final String app;
final String appName; final String appName;
@@ -82,14 +81,11 @@ class Checker extends StatefulWidget {
Checker(this.app, this.appName, this.helper); Checker(this.app, this.appName, this.helper);
@override @override
State<StatefulWidget> createState() => new CheckerState( State<StatefulWidget> createState() =>
this.app, new CheckerState(this.app, this.appName, this.helper);
this.appName,
this.helper);
} }
class CheckerState extends State<Checker> { class CheckerState extends State<Checker> {
SqliteHelper helper; SqliteHelper helper;
String app; String app;
String appName; String appName;
@@ -98,9 +94,6 @@ class CheckerState extends State<Checker> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return new MaterialApp( return new MaterialApp(title: appName, home: new SplashScreen(helper, app));
title: appName,
home: new SplashScreen(helper, app)
);
} }
} }

View File

@@ -7,14 +7,14 @@ packages:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.8" version: "2.4.0"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
name: charcode name: charcode
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.2" version: "1.1.3"
collection: collection:
dependency: transitive dependency: transitive
description: description:
@@ -29,18 +29,18 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1" version: "2.1.1"
dart2_constant:
dependency: transitive
description:
name: dart2_constant
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2+dart2"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
name: flutter_plugin_android_lifecycle
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.6"
http: http:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -61,7 +61,7 @@ packages:
name: image_picker name: image_picker
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.1+11" version: "0.6.3+4"
intl: intl:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -69,34 +69,27 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.16.1" version: "0.16.1"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.6"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.7" version: "1.1.8"
path: path:
dependency: transitive dependency: transitive
description: description:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.2" version: "1.6.4"
path_provider: path_provider:
dependency: "direct main" dependency: "direct main"
description: description:
name: path_provider name: path_provider
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.4.5" version: "1.6.1"
pedantic: pedantic:
dependency: transitive dependency: transitive
description: description:
@@ -118,20 +111,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.2.1" version: "2.2.1"
quiver:
dependency: transitive
description:
name: quiver
url: "https://pub.dartlang.org"
source: hosted
version: "0.29.0+2"
sentry: sentry:
dependency: "direct main" dependency: "direct main"
description: description:
name: sentry name: sentry
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.1" version: "3.0.1"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@@ -143,7 +129,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.4.1" version: "1.6.0"
sprintf: sprintf:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -157,7 +143,7 @@ packages:
name: sqflite name: sqflite
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.8" version: "1.2.1"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
@@ -171,14 +157,21 @@ packages:
name: string_scanner name: string_scanner
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.4" version: "1.0.5"
synchronized: synchronized:
dependency: transitive dependency: transitive
description: description:
name: synchronized name: synchronized
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1" version: "2.2.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
@@ -206,7 +199,7 @@ packages:
name: xml name: xml
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.5.0" version: "3.6.0"
sdks: sdks:
dart: ">=2.5.0 <3.0.0" dart: ">=2.6.0 <3.0.0"
flutter: ">=1.9.1+hotfix.5 <2.0.0" flutter: ">=1.12.13 <2.0.0"

View File

@@ -4,11 +4,11 @@ description: A new Flutter project.
dependencies: dependencies:
http: '0.12.0+4' http: '0.12.0+4'
sprintf: "4.0.2" sprintf: "4.0.2"
path_provider: "1.4.5" path_provider: "1.6.1"
sqflite: "1.1.8" sqflite: "1.2.1"
image_picker: '0.6.1+11' # use for ask permissions @ iOS image_picker: '0.6.3+4' # use for ask permissions @ iOS
xml: "3.5.0" xml: "3.6.0"
sentry: 2.0.1 sentry: 3.0.1
intl: 0.16.1 intl: 0.16.1
flutter: flutter:
sdk: flutter sdk: flutter