From fa21768f75441685e74116d1baba56b4a9f21e06 Mon Sep 17 00:00:00 2001 From: "Farcas, Claudiu" Date: Fri, 10 Aug 2018 12:24:02 +0300 Subject: [PATCH] fix Dart2 cast and gradle upgrade --- example/android/app/build.gradle | 6 +++--- example/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- example/lib/main.dart | 11 +++++------ src/appcenter/android/build.gradle | 7 ++++--- .../android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- src/appcenter/lib/appcenter.dart | 10 +++++----- src/appcenter_analytics/android/build.gradle | 7 ++++--- .../android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- src/appcenter_analytics/lib/appcenter_analytics.dart | 5 ++++- src/appcenter_crashes/android/build.gradle | 7 ++++--- .../android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- src/appcenter_crashes/lib/appcenter_crashes.dart | 5 ++++- 13 files changed, 42 insertions(+), 34 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 120afd0..3d0c94c 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -46,7 +46,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + androidTestImplementation 'com.android.support:support-annotations:25.4.0' + androidTestImplementation 'com.android.support.test:runner:0.5' + androidTestImplementation 'com.android.support.test:rules:0.5' } diff --git a/example/android/build.gradle b/example/android/build.gradle index 77cbd09..b17cff5 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.1.4' } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14..9db2fab 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Fri Aug 10 12:01:12 EEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/example/lib/main.dart b/example/lib/main.dart index 7396cea..5894687 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:appcenter/appcenter.dart'; import 'package:appcenter_analytics/appcenter_analytics.dart'; import 'package:appcenter_crashes/appcenter_crashes.dart'; @@ -15,13 +14,13 @@ class MyApp extends StatefulWidget { class _MyAppState extends State { - String _app_secret; + String _appSecret; String _installId = 'Unknown'; bool _areAnalyticsEnabled = false, _areCrashesEnabled = false; _MyAppState() { final ios = defaultTargetPlatform == TargetPlatform.iOS; - _app_secret = ios ? "a8a33033-ef2f-4911-a664-a7d118287ce7" : "3f1f3b0e-24ff-436a-b42d-3c08b117d46a"; + _appSecret = ios ? "a8a33033-ef2f-4911-a664-a7d118287ce7" : "3f1f3b0e-24ff-436a-b42d-3c08b117d46a"; } @override @@ -32,7 +31,7 @@ class _MyAppState extends State { // Platform messages are asynchronous, so we initialize in an async method. initPlatformState() async { - await AppCenter.start(_app_secret, [AppCenterAnalytics.id, AppCenterCrashes.id]); + await AppCenter.start(_appSecret, [AppCenterAnalytics.id, AppCenterCrashes.id]); if (!mounted) return; @@ -69,12 +68,12 @@ class _MyAppState extends State { new IconButton( icon: new Icon(Icons.map), tooltip: 'map', - onPressed: () { AppcenterAnalytics.trackEvent("map"); }, + onPressed: () { AppCenterAnalytics.trackEvent("map"); }, ), new IconButton( icon: new Icon(Icons.casino), tooltip: 'casino', - onPressed: () { AppcenterAnalytics.trackEvent("casino", { "dollars" : "10" }); }, + onPressed: () { AppCenterAnalytics.trackEvent("casino", { "dollars" : "10" }); }, ), ]) ] diff --git a/src/appcenter/android/build.gradle b/src/appcenter/android/build.gradle index eaed192..5955d9c 100644 --- a/src/appcenter/android/build.gradle +++ b/src/appcenter/android/build.gradle @@ -7,10 +7,11 @@ buildscript { maven { url "https://maven.google.com" } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.1.4' } } @@ -40,7 +41,7 @@ android { disable 'InvalidPackage' } dependencies { - def appCenterSdkVersion = '1.1.0' - compile "com.microsoft.appcenter:appcenter:${appCenterSdkVersion}" + def appCenterSdkVersion = '1.7.0' + implementation "com.microsoft.appcenter:appcenter:${appCenterSdkVersion}" } } diff --git a/src/appcenter/android/gradle/wrapper/gradle-wrapper.properties b/src/appcenter/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14..34a6c3f 100644 --- a/src/appcenter/android/gradle/wrapper/gradle-wrapper.properties +++ b/src/appcenter/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Fri Aug 10 11:35:19 EEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/src/appcenter/lib/appcenter.dart b/src/appcenter/lib/appcenter.dart index ec84631..74baf9e 100644 --- a/src/appcenter/lib/appcenter.dart +++ b/src/appcenter/lib/appcenter.dart @@ -7,16 +7,16 @@ class AppCenter { static const MethodChannel _channel = const MethodChannel('aloisdeniel.github.com/flutter_plugin_appcenter/appcenter'); /// Starts App Center services - static Future configure(String app_secret) => _channel.invokeMethod('configure', { - 'app_secret': app_secret, + static Future configure(String appSecret) => _channel.invokeMethod('configure', { + 'app_secret': appSecret, }); - static Future start(String app_secret, List services) => _channel.invokeMethod('start', { - 'app_secret': app_secret, + static Future start(String appSecret, List services) => _channel.invokeMethod('start', { + 'app_secret': appSecret, 'services': services }); - static Future get installId => _channel.invokeMethod('installId'); + static Future get installId => _channel.invokeMethod('installId'); static Future get isEnabled => _channel.invokeMethod('isEnabled'); diff --git a/src/appcenter_analytics/android/build.gradle b/src/appcenter_analytics/android/build.gradle index aeb5900..def57b6 100644 --- a/src/appcenter_analytics/android/build.gradle +++ b/src/appcenter_analytics/android/build.gradle @@ -7,10 +7,11 @@ buildscript { maven { url "https://maven.google.com" } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.1.4' } } @@ -40,7 +41,7 @@ android { disable 'InvalidPackage' } dependencies { - def appCenterSdkVersion = '1.1.0' - compile "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}" + def appCenterSdkVersion = '1.7.0' + implementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}" } } diff --git a/src/appcenter_analytics/android/gradle/wrapper/gradle-wrapper.properties b/src/appcenter_analytics/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14..040ed55 100644 --- a/src/appcenter_analytics/android/gradle/wrapper/gradle-wrapper.properties +++ b/src/appcenter_analytics/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Fri Aug 10 11:40:38 EEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/src/appcenter_analytics/lib/appcenter_analytics.dart b/src/appcenter_analytics/lib/appcenter_analytics.dart index 768c911..c14f645 100644 --- a/src/appcenter_analytics/lib/appcenter_analytics.dart +++ b/src/appcenter_analytics/lib/appcenter_analytics.dart @@ -10,7 +10,10 @@ class AppCenterAnalytics { static const MethodChannel _channel = const MethodChannel('aloisdeniel.github.com/flutter_plugin_appcenter/appcenter_analytics'); - static Future get isEnabled => _channel.invokeMethod('isEnabled'); + static Future get isEnabled async { + final bool result = await _channel.invokeMethod('isEnabled'); + return result; + } static Future setEnabled(bool isEnabled) => _channel.invokeMethod('setEnabled', { 'isEnabled': isEnabled, diff --git a/src/appcenter_crashes/android/build.gradle b/src/appcenter_crashes/android/build.gradle index f3a84ce..537c8bb 100644 --- a/src/appcenter_crashes/android/build.gradle +++ b/src/appcenter_crashes/android/build.gradle @@ -7,10 +7,11 @@ buildscript { maven { url "https://maven.google.com" } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.1.4' } } @@ -40,7 +41,7 @@ android { disable 'InvalidPackage' } dependencies { - def appCenterSdkVersion = '1.1.0' - compile "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}" + def appCenterSdkVersion = '1.7.0' + implementation "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}" } } diff --git a/src/appcenter_crashes/android/gradle/wrapper/gradle-wrapper.properties b/src/appcenter_crashes/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14..f62b387 100644 --- a/src/appcenter_crashes/android/gradle/wrapper/gradle-wrapper.properties +++ b/src/appcenter_crashes/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Fri Aug 10 11:44:18 EEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/src/appcenter_crashes/lib/appcenter_crashes.dart b/src/appcenter_crashes/lib/appcenter_crashes.dart index ad87bca..670fc64 100644 --- a/src/appcenter_crashes/lib/appcenter_crashes.dart +++ b/src/appcenter_crashes/lib/appcenter_crashes.dart @@ -10,7 +10,10 @@ class AppCenterCrashes { static const MethodChannel _channel = const MethodChannel('aloisdeniel.github.com/flutter_plugin_appcenter/appcenter_crashes'); - static Future get isEnabled => _channel.invokeMethod('isEnabled'); + static Future get isEnabled async { + final bool result = await _channel.invokeMethod('isEnabled'); + return result; + } static Future setEnabled(bool isEnabled) => _channel.invokeMethod('setEnabled', { 'isEnabled': isEnabled,