diff --git a/null_safety/null_safe_app/android/.gitignore b/null_safety/null_safe_app/android/.gitignore
index 0a741cb43..6f568019d 100644
--- a/null_safety/null_safe_app/android/.gitignore
+++ b/null_safety/null_safe_app/android/.gitignore
@@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+**/*.keystore
+**/*.jks
diff --git a/null_safety/null_safe_app/android/app/build.gradle b/null_safety/null_safe_app/android/app/build.gradle
index 847b9d95f..ec0d91158 100644
--- a/null_safety/null_safe_app/android/app/build.gradle
+++ b/null_safety/null_safe_app/android/app/build.gradle
@@ -26,21 +26,26 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion flutter.compileSdkVersion
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.null_safe_app"
-        minSdkVersion 16
-        targetSdkVersion 29
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/null_safety/null_safe_app/android/app/src/main/AndroidManifest.xml b/null_safety/null_safe_app/android/app/src/main/AndroidManifest.xml
index de8fb0ad5..56a769b06 100644
--- a/null_safety/null_safe_app/android/app/src/main/AndroidManifest.xml
+++ b/null_safety/null_safe_app/android/app/src/main/AndroidManifest.xml
@@ -2,9 +2,11 @@
     package="com.example.null_safe_app">
    <application
         android:label="null_safe_app"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -18,15 +20,6 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/null_safety/null_safe_app/android/app/src/main/res/drawable-v21/launch_background.xml b/null_safety/null_safe_app/android/app/src/main/res/drawable-v21/launch_background.xml
new file mode 100644
index 000000000..f74085f3f
--- /dev/null
+++ b/null_safety/null_safe_app/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/null_safety/null_safe_app/android/app/src/main/res/drawable/launch_background.xml b/null_safety/null_safe_app/android/app/src/main/res/drawable/launch_background.xml
index f74085f3f..304732f88 100644
--- a/null_safety/null_safe_app/android/app/src/main/res/drawable/launch_background.xml
+++ b/null_safety/null_safe_app/android/app/src/main/res/drawable/launch_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
+    <item android:drawable="@android:color/white" />
 
     <!-- You can insert your own image assets here -->
     <!-- <item>
diff --git a/null_safety/null_safe_app/android/app/src/main/res/values-night/styles.xml b/null_safety/null_safe_app/android/app/src/main/res/values-night/styles.xml
index 449a9f930..3db14bb53 100644
--- a/null_safety/null_safe_app/android/app/src/main/res/values-night/styles.xml
+++ b/null_safety/null_safe_app/android/app/src/main/res/values-night/styles.xml
@@ -10,7 +10,7 @@
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/null_safety/null_safe_app/android/app/src/main/res/values/styles.xml b/null_safety/null_safe_app/android/app/src/main/res/values/styles.xml
index d74aa35c2..d460d1e92 100644
--- a/null_safety/null_safe_app/android/app/src/main/res/values/styles.xml
+++ b/null_safety/null_safe_app/android/app/src/main/res/values/styles.xml
@@ -10,7 +10,7 @@
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/null_safety/null_safe_app/android/build.gradle b/null_safety/null_safe_app/android/build.gradle
index 3100ad2d5..4256f9173 100644
--- a/null_safety/null_safe_app/android/build.gradle
+++ b/null_safety/null_safe_app/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -14,7 +14,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/null_safety/null_safe_app/android/gradle.properties b/null_safety/null_safe_app/android/gradle.properties
index a6738207f..94adc3a3f 100644
--- a/null_safety/null_safe_app/android/gradle.properties
+++ b/null_safety/null_safe_app/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8=true
diff --git a/null_safety/null_safe_app/android/gradle/wrapper/gradle-wrapper.properties b/null_safety/null_safe_app/android/gradle/wrapper/gradle-wrapper.properties
index 296b146b7..bc6a58afd 100644
--- a/null_safety/null_safe_app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/null_safety/null_safe_app/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.7-all.zip
diff --git a/null_safety/null_safe_app/android/null_safe_app_android.iml b/null_safety/null_safe_app/android/null_safe_app_android.iml
index 655d2fa2a..18999696a 100644
--- a/null_safety/null_safe_app/android/null_safe_app_android.iml
+++ b/null_safety/null_safe_app/android/null_safe_app_android.iml
@@ -4,6 +4,8 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/app/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/app/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/app/src/main/assets" />
@@ -24,4 +26,4 @@
     <orderEntry type="library" name="Flutter for Android" level="project" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
-</module>
\ No newline at end of file
+</module>
diff --git a/null_safety/null_unsafe_app/android/.gitignore b/null_safety/null_unsafe_app/android/.gitignore
index 0a741cb43..6f568019d 100644
--- a/null_safety/null_unsafe_app/android/.gitignore
+++ b/null_safety/null_unsafe_app/android/.gitignore
@@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+**/*.keystore
+**/*.jks
diff --git a/null_safety/null_unsafe_app/android/app/build.gradle b/null_safety/null_unsafe_app/android/app/build.gradle
index b1176e0a3..c52a6ad8c 100644
--- a/null_safety/null_unsafe_app/android/app/build.gradle
+++ b/null_safety/null_unsafe_app/android/app/build.gradle
@@ -26,21 +26,26 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion flutter.compileSdkVersion
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.null_unsafe_app"
-        minSdkVersion 16
-        targetSdkVersion 29
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/null_safety/null_unsafe_app/android/app/src/main/AndroidManifest.xml b/null_safety/null_unsafe_app/android/app/src/main/AndroidManifest.xml
index d78d0057b..481a51c13 100644
--- a/null_safety/null_unsafe_app/android/app/src/main/AndroidManifest.xml
+++ b/null_safety/null_unsafe_app/android/app/src/main/AndroidManifest.xml
@@ -2,9 +2,11 @@
     package="com.example.null_unsafe_app">
    <application
         android:label="null_unsafe_app"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -18,15 +20,6 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/null_safety/null_unsafe_app/android/app/src/main/res/drawable-v21/launch_background.xml b/null_safety/null_unsafe_app/android/app/src/main/res/drawable-v21/launch_background.xml
new file mode 100644
index 000000000..f74085f3f
--- /dev/null
+++ b/null_safety/null_unsafe_app/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/null_safety/null_unsafe_app/android/app/src/main/res/drawable/launch_background.xml b/null_safety/null_unsafe_app/android/app/src/main/res/drawable/launch_background.xml
index f74085f3f..304732f88 100644
--- a/null_safety/null_unsafe_app/android/app/src/main/res/drawable/launch_background.xml
+++ b/null_safety/null_unsafe_app/android/app/src/main/res/drawable/launch_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
+    <item android:drawable="@android:color/white" />
 
     <!-- You can insert your own image assets here -->
     <!-- <item>
diff --git a/null_safety/null_unsafe_app/android/app/src/main/res/values-night/styles.xml b/null_safety/null_unsafe_app/android/app/src/main/res/values-night/styles.xml
index 449a9f930..3db14bb53 100644
--- a/null_safety/null_unsafe_app/android/app/src/main/res/values-night/styles.xml
+++ b/null_safety/null_unsafe_app/android/app/src/main/res/values-night/styles.xml
@@ -10,7 +10,7 @@
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/null_safety/null_unsafe_app/android/app/src/main/res/values/styles.xml b/null_safety/null_unsafe_app/android/app/src/main/res/values/styles.xml
index d74aa35c2..d460d1e92 100644
--- a/null_safety/null_unsafe_app/android/app/src/main/res/values/styles.xml
+++ b/null_safety/null_unsafe_app/android/app/src/main/res/values/styles.xml
@@ -10,7 +10,7 @@
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/null_safety/null_unsafe_app/android/build.gradle b/null_safety/null_unsafe_app/android/build.gradle
index 3100ad2d5..4256f9173 100644
--- a/null_safety/null_unsafe_app/android/build.gradle
+++ b/null_safety/null_unsafe_app/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -14,7 +14,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/null_safety/null_unsafe_app/android/gradle.properties b/null_safety/null_unsafe_app/android/gradle.properties
index a6738207f..94adc3a3f 100644
--- a/null_safety/null_unsafe_app/android/gradle.properties
+++ b/null_safety/null_unsafe_app/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8=true
diff --git a/null_safety/null_unsafe_app/android/gradle/wrapper/gradle-wrapper.properties b/null_safety/null_unsafe_app/android/gradle/wrapper/gradle-wrapper.properties
index 296b146b7..bc6a58afd 100644
--- a/null_safety/null_unsafe_app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/null_safety/null_unsafe_app/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.7-all.zip