Merge pull request letsar#198 from diegotori/null_safety

Null Safety Stable Release Candidate
codespair · Apr 11, 2021 · 39d3b49 · 39d3b49
2 parents e196a30 + aee274a
commit 39d3b49
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -40,7 +40,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.example"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.4.31'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git 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
+#Sun Mar 21 00:17:22 EDT 2021
 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.5-all.zip
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -193,13 +193,13 @@ class _MyHomePageState extends State<MyHomePage> {
                       title: Text('Delete'),
                       content: Text('Item will be deleted'),
                       actions: <Widget>[
-                        FlatButton(
+                        TextButton(
                           child: Text('Cancel'),
-                          onPressed: () => Navigator.of(context)!.pop(false),
+                          onPressed: () => Navigator.of(context).pop(false),
                         ),
-                        FlatButton(
+                        TextButton(
                           child: Text('Ok'),
-                          onPressed: () => Navigator.of(context)!.pop(true),
+                          onPressed: () => Navigator.of(context).pop(true),
                         ),
                       ],
                     );
@@ -243,13 +243,13 @@ class _MyHomePageState extends State<MyHomePage> {
                         title: Text('Delete'),
                         content: Text('Item will be deleted'),
                         actions: <Widget>[
-                          FlatButton(
+                          TextButton(
                             child: Text('Cancel'),
-                            onPressed: () => Navigator.of(context)!.pop(false),
+                            onPressed: () => Navigator.of(context).pop(false),
                           ),
-                          FlatButton(
+                          TextButton(
                             child: Text('Ok'),
-                            onPressed: () => Navigator.of(context)!.pop(true),
+                            onPressed: () => Navigator.of(context).pop(true),
                           ),
                         ],
                       );

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -4,13 +4,13 @@ publish_to: "none"
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.12.0-29.10.beta <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
 
-  cupertino_icons: ^0.1.3
+  cupertino_icons: ^1.0.2
   flutter_slidable:
     path: ../
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  test: ^1.5.1
+  test: ^1.16.5
 
 environment:
-  sdk: ">=2.12.0-29.10.beta <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"