Update Android Gradle version for latest beta + Android Toolchain

brianegan · brianegan · commit f9bfa7d9b2df · 2018-11-10T17:14:35.000+01:00
diff --git a/example/bloc_flutter/android/build.gradle b/example/bloc_flutter/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath 'com.google.gms:google-services:3.1.2'
     }
 }
diff --git a/example/bloc_flutter/android/gradle/wrapper/gradle-wrapper.properties b/example/bloc_flutter/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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/example/built_redux/android/build.gradle b/example/built_redux/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }
 
diff --git a/example/built_redux/android/gradle/wrapper/gradle-wrapper.properties b/example/built_redux/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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/example/firestore_redux/android/build.gradle b/example/firestore_redux/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath 'com.google.gms:google-services:3.2.1'
     }
 }
diff --git a/example/firestore_redux/android/gradle/wrapper/gradle-wrapper.properties b/example/firestore_redux/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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/example/firestore_redux/lib/main.dart b/example/firestore_redux/lib/main.dart
@@ -61,16 +61,8 @@ class ReduxApp extends StatelessWidget {
           FirestoreReduxLocalizationsDelegate(),
         ],
         routes: {
-          ArchSampleRoutes.home: (context) {
-            return StoreBuilder<AppState>(
-              builder: (context, store) {
-                return HomeScreen();
-              },
-            );
-          },
-          ArchSampleRoutes.addTodo: (context) {
-            return AddTodo();
-          },
+          ArchSampleRoutes.home: (context) => HomeScreen(),
+          ArchSampleRoutes.addTodo: (context) => AddTodo(),
         },
       ),
     );
diff --git a/example/inherited_widget/android/build.gradle b/example/inherited_widget/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }
 
diff --git a/example/inherited_widget/android/gradle/wrapper/gradle-wrapper.properties b/example/inherited_widget/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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/example/mvi_flutter/android/build.gradle b/example/mvi_flutter/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath 'com.google.gms:google-services:3.1.2'
     }
 }
diff --git a/example/mvi_flutter/android/gradle/wrapper/gradle-wrapper.properties b/example/mvi_flutter/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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/example/mvu/android/build.gradle b/example/mvu/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }
 
diff --git a/example/mvu/android/gradle/wrapper/gradle-wrapper.properties b/example/mvu/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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/example/redux/android/build.gradle b/example/redux/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }
 
diff --git a/example/redux/android/gradle/wrapper/gradle-wrapper.properties b/example/redux/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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/example/redux/lib/containers/stats.dart b/example/redux/lib/containers/stats.dart
@@ -16,6 +16,7 @@ class Stats extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return StoreConnector<AppState, _ViewModel>(
+      distinct: true,
       converter: _ViewModel.fromStore,
       builder: (context, vm) {
         return StatsCounter(
@@ -39,4 +40,20 @@ class _ViewModel {
       numCompleted: numCompletedSelector(todosSelector(store.state)),
     );
   }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is _ViewModel &&
+          runtimeType == other.runtimeType &&
+          numCompleted == other.numCompleted &&
+          numActive == other.numActive;
+
+  @override
+  int get hashCode => numCompleted.hashCode ^ numActive.hashCode;
+
+  @override
+  String toString() {
+    return '_ViewModel{numCompleted: $numCompleted, numActive: $numActive}';
+  }
 }
diff --git a/example/redux/lib/main.dart b/example/redux/lib/main.dart
@@ -38,10 +38,9 @@ class ReduxApp extends StatelessWidget {
         ],
         routes: {
           ArchSampleRoutes.home: (context) {
-            return StoreBuilder<AppState>(
-              onInit: (store) => store.dispatch(LoadTodosAction()),
-              builder: (context, store) {
-                return HomeScreen();
+            return HomeScreen(
+              onInit: () {
+                StoreProvider.of<AppState>(context).dispatch(LoadTodosAction());
               },
             );
           },
diff --git a/example/redux/lib/presentation/home_screen.dart b/example/redux/lib/presentation/home_screen.dart
@@ -13,8 +13,23 @@ import 'package:redux_sample/containers/tab_selector.dart';
 import 'package:redux_sample/localization.dart';
 import 'package:redux_sample/models/models.dart';
 
-class HomeScreen extends StatelessWidget {
-  HomeScreen() : super(key: ArchSampleKeys.homeScreen);
+class HomeScreen extends StatefulWidget {
+  final void Function() onInit;
+
+  HomeScreen({@required this.onInit}) : super(key: ArchSampleKeys.homeScreen);
+
+  @override
+  HomeScreenState createState() {
+    return new HomeScreenState();
+  }
+}
+
+class HomeScreenState extends State<HomeScreen> {
+  @override
+  void initState() {
+    widget.onInit();
+    super.initState();
+  }
 
   @override
   Widget build(BuildContext context) {
diff --git a/example/scoped_model/android/build.gradle b/example/scoped_model/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }
 
diff --git a/example/scoped_model/android/gradle/wrapper/gradle-wrapper.properties b/example/scoped_model/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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/example/simple_bloc_flutter/android/build.gradle b/example/simple_bloc_flutter/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath 'com.google.gms:google-services:3.2.1'
     }
 }
diff --git a/example/simple_bloc_flutter/android/gradle/wrapper/gradle-wrapper.properties b/example/simple_bloc_flutter/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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/example/vanilla/android/build.gradle b/example/vanilla/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }
 
diff --git a/example/vanilla/android/gradle/wrapper/gradle-wrapper.properties b/example/vanilla/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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/lib/src/theme.dart b/lib/src/theme.dart
@@ -15,6 +15,7 @@ class ArchSampleTheme {
         buttonColor: Colors.grey[800],
         textSelectionColor: Colors.cyan[100],
         backgroundColor: Colors.grey[800],
+        toggleableActiveColor: Colors.cyan[300],
         textTheme: originalTextTheme.copyWith(
             body1:
                 originalBody1.copyWith(decorationColor: Colors.transparent)));

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:3.0.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:3.1.2'`
`9`	`9`	`classpath 'com.google.gms:google-services:3.1.2'`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`jcenter()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:3.0.1'`
	`7`	`+ classpath 'com.android.tools.build:gradle:3.1.2'`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`