Remove podspec lint bash script, use flutter_plugin_tools

jmagman · jmagman · commit 6e5e731cfc3c · 2019-12-10T12:28:59.000-08:00
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -114,8 +114,6 @@ task:
         - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
         - flutter channel $CHANNEL
         - ./script/build_all_plugins_app.sh ios --no-codesign
-    - name: lint_darwin_plugins
-      script: ./script/lint_darwin_plugins.sh
     - name: build-ipas+drive-examples
       env:
         PATH: $PATH:/usr/local/bin
@@ -139,6 +137,13 @@ task:
         - flutter channel $CHANNEL
         - ./script/incremental_build.sh build-examples --ipa
         - ./script/incremental_build.sh drive-examples
+    - name: lint_darwin_plugins
+      script:
+        # TODO(jmagman): Lint macOS podspecs but skip any that fail library validation.
+        - find . -name "*.podspec" | xargs grep -l "osx" | xargs rm
+        # Skip the dummy podspecs used to placate the tool.
+        - find . -name "*_web*.podspec" -o -name "*_mac*.podspec" | xargs rm
+        - ./script/incremental_build.sh podspecs --no-analyze camera
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   osx_instance:
@@ -156,8 +161,6 @@ task:
       script:
         - flutter channel master
         - ./script/build_all_plugins_app.sh macos
-    - name: lint_darwin_plugins
-      script: ./script/lint_darwin_plugins.sh
     - name: build-apps+drive-examples
       env:
         PATH: $PATH:/usr/local/bin
diff --git a/packages/google_sign_in/google_sign_in/CHANGELOG.md b/packages/google_sign_in/google_sign_in/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.18
+
+* Remove unused local variable in iOS code, fix analyzer warning.
+
 ## 4.0.17
 
 * Add missing documentation and fix an unawaited future in the example app.
diff --git a/packages/google_sign_in/google_sign_in/example/lib/main.dart b/packages/google_sign_in/google_sign_in/example/lib/main.dart
@@ -7,7 +7,7 @@
 import 'dart:async';
 import 'dart:convert' show json;
 
-import "package:http/http.dart" as http;
+import 'package:http/http.dart' as http;
 import 'package:flutter/material.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 
@@ -52,7 +52,7 @@ class SignInDemoState extends State<SignInDemo> {
 
   Future<void> _handleGetContact() async {
     setState(() {
-      _contactText = "Loading contact info...";
+      _contactText = 'Loading contact info...';
     });
     final http.Response response = await http.get(
       'https://people.googleapis.com/v1/people/me/connections'
@@ -61,8 +61,8 @@ class SignInDemoState extends State<SignInDemo> {
     );
     if (response.statusCode != 200) {
       setState(() {
-        _contactText = "People API gave a ${response.statusCode} "
-            "response. Check logs for details.";
+        _contactText = 'People API gave a ${response.statusCode} '
+            'response. Check logs for details.';
       });
       print('People API ${response.statusCode} response: ${response.body}');
       return;
@@ -71,9 +71,9 @@ class SignInDemoState extends State<SignInDemo> {
     final String namedContact = _pickFirstNamedContact(data);
     setState(() {
       if (namedContact != null) {
-        _contactText = "I see you know $namedContact!";
+        _contactText = 'I see you know $namedContact!';
       } else {
-        _contactText = "No contacts to display.";
+        _contactText = 'No contacts to display.';
       }
     });
   }
@@ -118,7 +118,7 @@ class SignInDemoState extends State<SignInDemo> {
             title: Text(_currentUser.displayName ?? ''),
             subtitle: Text(_currentUser.email ?? ''),
           ),
-          const Text("Signed in successfully."),
+          const Text('Signed in successfully.'),
           Text(_contactText ?? ''),
           RaisedButton(
             child: const Text('SIGN OUT'),
@@ -134,7 +134,7 @@ class SignInDemoState extends State<SignInDemo> {
       return Column(
         mainAxisAlignment: MainAxisAlignment.spaceAround,
         children: <Widget>[
-          const Text("You are not currently signed in."),
+          const Text('You are not currently signed in.'),
           RaisedButton(
             child: const Text('SIGN IN'),
             onPressed: _handleSignIn,
diff --git a/packages/google_sign_in/google_sign_in/ios/Classes/FLTGoogleSignInPlugin.m b/packages/google_sign_in/google_sign_in/ios/Classes/FLTGoogleSignInPlugin.m
@@ -135,7 +135,6 @@ - (BOOL)setAccountRequest:(FlutterResult)request {
 }
 
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options {
-  NSString *sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey];
   return [[GIDSignIn sharedInstance] handleURL:url];
 }
 
diff --git a/packages/google_sign_in/google_sign_in/pubspec.yaml b/packages/google_sign_in/google_sign_in/pubspec.yaml
@@ -2,7 +2,7 @@ name: google_sign_in
 description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in
-version: 4.0.17
+version: 4.0.18
 
 flutter:
   plugin:
diff --git a/script/lint_darwin_plugins.sh b/script/lint_darwin_plugins.sh

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,6 @@ - (BOOL)setAccountRequest:(FlutterResult)request {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`- (BOOL)application:(UIApplication )app openURL:(NSURL )url options:(NSDictionary *)options {`
`138`		`- NSString *sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey];`
`139`	`138`	`return [[GIDSignIn sharedInstance] handleURL:url];`
`140`	`139`	`}`
`141`	`140`