Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 6e5e731

Browse files
committed
Remove podspec lint bash script, use flutter_plugin_tools
1 parent 661d298 commit 6e5e731

File tree

6 files changed

+20
-102
lines changed

6 files changed

+20
-102
lines changed

.cirrus.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ task:
114114
- if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
115115
- flutter channel $CHANNEL
116116
- ./script/build_all_plugins_app.sh ios --no-codesign
117-
- name: lint_darwin_plugins
118-
script: ./script/lint_darwin_plugins.sh
119117
- name: build-ipas+drive-examples
120118
env:
121119
PATH: $PATH:/usr/local/bin
@@ -139,6 +137,13 @@ task:
139137
- flutter channel $CHANNEL
140138
- ./script/incremental_build.sh build-examples --ipa
141139
- ./script/incremental_build.sh drive-examples
140+
- name: lint_darwin_plugins
141+
script:
142+
# TODO(jmagman): Lint macOS podspecs but skip any that fail library validation.
143+
- find . -name "*.podspec" | xargs grep -l "osx" | xargs rm
144+
# Skip the dummy podspecs used to placate the tool.
145+
- find . -name "*_web*.podspec" -o -name "*_mac*.podspec" | xargs rm
146+
- ./script/incremental_build.sh podspecs --no-analyze camera
142147
task:
143148
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
144149
osx_instance:
@@ -156,8 +161,6 @@ task:
156161
script:
157162
- flutter channel master
158163
- ./script/build_all_plugins_app.sh macos
159-
- name: lint_darwin_plugins
160-
script: ./script/lint_darwin_plugins.sh
161164
- name: build-apps+drive-examples
162165
env:
163166
PATH: $PATH:/usr/local/bin

packages/google_sign_in/google_sign_in/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 4.0.18
2+
3+
* Remove unused local variable in iOS code, fix analyzer warning.
4+
15
## 4.0.17
26

37
* Add missing documentation and fix an unawaited future in the example app.

packages/google_sign_in/google_sign_in/example/lib/main.dart

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import 'dart:async';
88
import 'dart:convert' show json;
99

10-
import "package:http/http.dart" as http;
10+
import 'package:http/http.dart' as http;
1111
import 'package:flutter/material.dart';
1212
import 'package:google_sign_in/google_sign_in.dart';
1313

@@ -52,7 +52,7 @@ class SignInDemoState extends State<SignInDemo> {
5252

5353
Future<void> _handleGetContact() async {
5454
setState(() {
55-
_contactText = "Loading contact info...";
55+
_contactText = 'Loading contact info...';
5656
});
5757
final http.Response response = await http.get(
5858
'https://people.googleapis.com/v1/people/me/connections'
@@ -61,8 +61,8 @@ class SignInDemoState extends State<SignInDemo> {
6161
);
6262
if (response.statusCode != 200) {
6363
setState(() {
64-
_contactText = "People API gave a ${response.statusCode} "
65-
"response. Check logs for details.";
64+
_contactText = 'People API gave a ${response.statusCode} '
65+
'response. Check logs for details.';
6666
});
6767
print('People API ${response.statusCode} response: ${response.body}');
6868
return;
@@ -71,9 +71,9 @@ class SignInDemoState extends State<SignInDemo> {
7171
final String namedContact = _pickFirstNamedContact(data);
7272
setState(() {
7373
if (namedContact != null) {
74-
_contactText = "I see you know $namedContact!";
74+
_contactText = 'I see you know $namedContact!';
7575
} else {
76-
_contactText = "No contacts to display.";
76+
_contactText = 'No contacts to display.';
7777
}
7878
});
7979
}
@@ -118,7 +118,7 @@ class SignInDemoState extends State<SignInDemo> {
118118
title: Text(_currentUser.displayName ?? ''),
119119
subtitle: Text(_currentUser.email ?? ''),
120120
),
121-
const Text("Signed in successfully."),
121+
const Text('Signed in successfully.'),
122122
Text(_contactText ?? ''),
123123
RaisedButton(
124124
child: const Text('SIGN OUT'),
@@ -134,7 +134,7 @@ class SignInDemoState extends State<SignInDemo> {
134134
return Column(
135135
mainAxisAlignment: MainAxisAlignment.spaceAround,
136136
children: <Widget>[
137-
const Text("You are not currently signed in."),
137+
const Text('You are not currently signed in.'),
138138
RaisedButton(
139139
child: const Text('SIGN IN'),
140140
onPressed: _handleSignIn,

packages/google_sign_in/google_sign_in/ios/Classes/FLTGoogleSignInPlugin.m

-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ - (BOOL)setAccountRequest:(FlutterResult)request {
135135
}
136136

137137
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options {
138-
NSString *sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey];
139138
return [[GIDSignIn sharedInstance] handleURL:url];
140139
}
141140

packages/google_sign_in/google_sign_in/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_sign_in
22
description: Flutter plugin for Google Sign-In, a secure authentication system
33
for signing in with a Google account on Android and iOS.
44
homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in
5-
version: 4.0.17
5+
version: 4.0.18
66

77
flutter:
88
plugin:

script/lint_darwin_plugins.sh

-88
This file was deleted.

0 commit comments

Comments
 (0)