Updated dependencies versions & migrated android to androidx

android/build.gradle

@@ -2,7 +2,7 @@ group 'com.example.wifi_connect'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.72'
     repositories {
         google()
         jcenter()
@@ -32,7 +32,7 @@ android {
     }
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     lintOptions {
         disable 'InvalidPackage'

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

example/.flutter-plugins-dependencies

@@ -0,0 +1 @@
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"location","path":"/Users/tb66jo/Developer/flutter/.pub-cache/hosted/pub.dartlang.org/location-3.0.2/","dependencies":[]},{"name":"plugin_scaffold","path":"/Users/tb66jo/Developer/flutter/.pub-cache/hosted/pub.dartlang.org/plugin_scaffold-2.0.0/","dependencies":[]},{"name":"use_location","path":"/Users/tb66jo/Developer/flutter/.pub-cache/hosted/pub.dartlang.org/use_location-0.0.3/","dependencies":["plugin_scaffold"]},{"name":"wifi_connect","path":"/Users/tb66jo/Developer/temp/flutter-wifi-connect/","dependencies":["plugin_scaffold","use_location","location"]}],"android":[{"name":"location","path":"/Users/tb66jo/Developer/flutter/.pub-cache/hosted/pub.dartlang.org/location-3.0.2/","dependencies":[]},{"name":"plugin_scaffold","path":"/Users/tb66jo/Developer/flutter/.pub-cache/hosted/pub.dartlang.org/plugin_scaffold-2.0.0/","dependencies":[]},{"name":"use_location","path":"/Users/tb66jo/Developer/flutter/.pub-cache/hosted/pub.dartlang.org/use_location-0.0.3/","dependencies":["plugin_scaffold"]},{"name":"wifi_connect","path":"/Users/tb66jo/Developer/temp/flutter-wifi-connect/","dependencies":["plugin_scaffold","use_location","location"]}],"macos":[{"name":"location","path":"/Users/tb66jo/Developer/flutter/.pub-cache/hosted/pub.dartlang.org/location-3.0.2/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"location_web","path":"/Users/tb66jo/Developer/flutter/.pub-cache/hosted/pub.dartlang.org/location_web-1.0.0/","dependencies":[]}]},"dependencyGraph":[{"name":"location","dependencies":["location_web"]},{"name":"location_web","dependencies":[]},{"name":"plugin_scaffold","dependencies":[]},{"name":"use_location","dependencies":["plugin_scaffold"]},{"name":"wifi_connect","dependencies":["plugin_scaffold","use_location","location"]}],"date_created":"2020-09-17 12:52:59.932936","version":"1.21.0-9.2.pre"}

example/android/app/build.gradle

@@ -43,7 +43,7 @@ android {
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
@@ -62,6 +62,9 @@ flutter {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    implementation "com.google.android.gms:play-services-tasks:17.0.0"
+    implementation "com.google.android.gms:play-services-base:17.0.0"
+    implementation "com.google.android.gms:play-services-location:17.0.0"
 }

example/android/app/src/main/AndroidManifest.xml

@@ -7,7 +7,6 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
         android:label="wifi_connect_example"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -29,5 +28,9 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 </manifest>

example/android/app/src/main/kotlin/com/example/wifi_connect_example/MainActivity.kt

@@ -2,12 +2,8 @@ package com.example.wifi_connect_example
 
 import android.os.Bundle
 
-import io.flutter.app.FlutterActivity
+import io.flutter.embedding.android.FlutterActivity
 import io.flutter.plugins.GeneratedPluginRegistrant
 
 class MainActivity: FlutterActivity() {
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    GeneratedPluginRegistrant.registerWith(this)
-  }
 }

example/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.72'
     repositories {
         google()
         jcenter()

example/android/gradle.properties

@@ -1,2 +1,5 @@
 org.gradle.jvmargs=-Xmx1536M
 
+android.enableR8=true
+android.useAndroidX=true
+android.enableJetifier=true

example/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-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

example/android/settings_aar.gradle

@@ -0,0 +1 @@
+include ':app'

example/pubspec.lock

@@ -1,62 +1,55 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.13"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.6.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.1"
+    version: "2.5.0-nullsafety"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0-nullsafety"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0-nullsafety.2"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.3"
-  collection:
+    version: "1.2.0-nullsafety"
+  clock:
     dependency: transitive
     description:
-      name: collection
+      name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.12"
-  convert:
+    version: "1.1.0-nullsafety"
+  collection:
     dependency: transitive
     description:
-      name: convert
+      name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
-  crypto:
+    version: "1.15.0-nullsafety.2"
+  fake_async:
     dependency: transitive
     description:
-      name: crypto
+      name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "1.1.0-nullsafety"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -79,13 +72,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.4"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.12"
   js:
     dependency: transitive
     description:
@@ -120,28 +106,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.6"
+    version: "0.12.10-nullsafety"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.8"
+    version: "1.3.0-nullsafety.2"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.4.0"
+    version: "1.8.0-nullsafety"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -156,13 +135,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -174,49 +146,49 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0-nullsafety"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
+    version: "1.10.0-nullsafety"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0-nullsafety"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0-nullsafety"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0-nullsafety"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.15"
+    version: "0.2.19-nullsafety"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.3.0-nullsafety.2"
   use_location:
     dependency: transitive
     description:
@@ -230,21 +202,14 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0-nullsafety.2"
   wifi_connect:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.2.0"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.6.1"
+    version: "0.2.1"
 sdks:
-  dart: ">=2.6.0 <3.0.0"
+  dart: ">=2.10.0-0.0.dev <2.10.0"
   flutter: ">=1.12.13+hotfix.5 <2.0.0"