Updated project dependencies and make it null-safe.

Author: slightfoot

.gitignore

@@ -6,6 +6,9 @@
 build/
 .packages
 pubspec.lock
+*.iml
 
 # iOS not required for this plugin
 ios/**
+windows/**
+macos/**

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.0.0
+
+- Null Safety Migration (Finally!)
+  - Thanks to Rexios and Peter Ullrich.
+  - Min Dart 2.12 / Flutter 2.5 
+- Updated native component versions:
+  - Gradle 6.5
+  - Android Gradle Plugin 4.1.0 
+  - Android compileSdkVersion 31
+  - AndroidX Wear 1.2.0
+  - Kotlin 1.5.10
+  - Removed `jcenter()` repo requirement.
+
 # 0.1.1
 
 - Fix Kotlin/Android compileOnly dep on com.google.android.wearable:wearable.

README.md

@@ -5,6 +5,11 @@ A plugin that offers Flutter support for Wear OS by Google (Android Wear).
 __To use this plugin you must set your `minSdkVersion` to `23`.__
 
 
+# Tutorial
+
+https://medium.com/flutter-community/flutter-building-wearos-app-fedf0f06d1b4
+
+
 # Widgets
 
 There currently three widgets provided by the plugin:
@@ -15,22 +20,22 @@ There currently three widgets provided by the plugin:
 
 ## Example
 
-Typically all three of these widgets would be used near the root of your app's widget tree:
+Typically, all three of these widgets would be used near the root of your app's widget tree:
 
 ```dart
 class WatchScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return WatchShape(
-      builder: (context, shape, child) {
+      builder: (BuildContext context, WearShape shape, Widget? child) {
         return AmbientMode(
           builder: (context, mode, child) {
             return mode == Mode.active ? ActiveWatchFace() : AmbientWatchFace();
           },
         );
       },
     );
-  },
+  }
 }
 ```
 

android/.gitignore

@@ -1,8 +1,7 @@
 *.iml
 .gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+local.properties
 .DS_Store
-/build
+.idea/
+build/
 /captures

android/build.gradle

@@ -2,22 +2,22 @@ group 'com.mjohnsullivan.flutterwear.wear'
 version '1.0-SNAPSHOT'
 
 buildscript {
-	ext.kotlin_version = '1.3.50'
+	ext.kotlin_version = '1.5.10'
 	repositories {
 		google()
-		jcenter()
+		mavenCentral()
 	}
 
 	dependencies {
-		classpath 'com.android.tools.build:gradle:3.5.4'
+		classpath 'com.android.tools.build:gradle:4.1.0'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 	}
 }
 
 rootProject.allprojects {
 	repositories {
 		google()
-		jcenter()
+		mavenCentral()
 	}
 }
 
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 //apply plugin: 'kotlin-android-extensions'
 
 android {
-	compileSdkVersion 29
+	compileSdkVersion 31
 
 	sourceSets {
 		main.java.srcDirs += 'src/main/kotlin'
@@ -42,9 +42,9 @@ android {
 dependencies {
 	//implementation "androidx.core:core-ktx:+"
 	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-	implementation 'androidx.wear:wear:1.0.0'
+	implementation 'androidx.wear:wear:1.2.0'
 	implementation 'com.google.android.support:wearable:2.8.1'
 	compileOnly 'com.google.android.wearable:wearable:2.8.1'
 
-	// compileOnly files('C:\\Android\\flutter\\bin\\cache\\artifacts\\engine\\android-x64\\flutter.jar')
+	compileOnly files('C:\\Android\\flutter\\bin\\cache\\artifacts\\engine\\android-x64\\flutter.jar')
 }

android/gradle.properties

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

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

example/.gitignore

@@ -29,7 +29,7 @@
 .packages
 .pub-cache/
 .pub/
-/build/
+build/
 
 # Web related
 lib/generated_plugin_registrant.dart
@@ -42,3 +42,5 @@ app.*.map.json
 
 # iOS not required for this plugin
 ios/**
+windows/**
+macos/**

example/.idea/libraries/Dart_SDK.xml

@@ -1,6 +1,3 @@
 # wear_example
 
 Demonstrates how to use the wear plugin.
-
-## Getting Started
-

example/.idea/modules.xml

@@ -0,0 +1 @@
+include: package:flutter_lints/flutter.yaml

example/.idea/runConfigurations/main_dart.xml

@@ -3,9 +3,9 @@ gradle-wrapper.jar
 /captures/
 /gradlew
 /gradlew.bat
-/local.properties
+/.idea
+local.properties
 GeneratedPluginRegistrant.java
-.idea/
 
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app

example/.idea/workspace.xml

@@ -8,7 +8,7 @@ if(localPropertiesFile.exists()) {
 
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if(flutterRoot == null) {
-	throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+	throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-	compileSdkVersion 29
+	compileSdkVersion 31
 
 	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.mjohnsullivan.flutterwear.wear_example"
 		minSdkVersion 23
-		targetSdkVersion 29
+		targetSdkVersion 25
 		versionCode flutterVersionCode.toInteger()
 		versionName flutterVersionName
 	}
@@ -60,7 +60,4 @@ flutter {
 
 dependencies {
 	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-	implementation 'androidx.wear:wear:1.0.0'
-	implementation 'com.google.android.support:wearable:2.8.1'
-	compileOnly 'com.google.android.wearable:wearable:2.8.1'
 }

example/README.md

@@ -1,20 +1,20 @@
 buildscript {
-	ext.kotlin_version = '1.3.50'
+	ext.kotlin_version = '1.5.10'
 	repositories {
 		google()
-		jcenter()
+		mavenCentral()
 	}
 
 	dependencies {
-		classpath 'com.android.tools.build:gradle:3.5.4'
+		classpath 'com.android.tools.build:gradle:4.1.0'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 	}
 }
 
 allprojects {
 	repositories {
 		google()
-		jcenter()
+		mavenCentral()
 	}
 }
 

example/analysis_options.yaml

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

example/android/.gitignore

@@ -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.5-all.zip

example/android/app/build.gradle

@@ -10,19 +10,19 @@ class MyApp extends StatelessWidget {
       home: Scaffold(
         body: Center(
           child: WatchShape(
-            builder: (context, shape, child) {
+            builder: (BuildContext context, WearShape shape, Widget? child) {
               return Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: <Widget>[
                   Text(
                     'Shape: ${shape == WearShape.round ? 'round' : 'square'}',
                   ),
-                  child,
+                  child!,
                 ],
               );
             },
             child: AmbientMode(
-              builder: (context, mode, child) {
+              builder: (BuildContext context, WearMode mode, Widget? child) {
                 return Text(
                   'Mode: ${mode == WearMode.active ? 'Active' : 'Ambient'}',
                 );

example/android/build.gradle

@@ -3,13 +3,15 @@ description: Demonstrates how to use the wear plugin.
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
+  flutter: ">=2.5.0"
 
 dependencies:
   wear:
     path: ../
   flutter:
     sdk: flutter
+  flutter_lints: ^1.0.4
 
 dev_dependencies:
   flutter_test: