[google_maps_flutter] Define clang module for iOS, fix analyzer warnings #2182

jmagman · 2019-10-11T23:27:35Z

Description

Limit the supported podspec platform to iOS so tests don't run (and fail) for macOS.
Define the module by setting DEFINES_MODULE in the podspec. See CocoaPod modular headers docs.
Explicitly set VALID_ARCHS to x86_64 for the simulator. See No way to add passing test_spec that doesn't cause build warning "Mapping architecture armv7 to i386. Ensure that this target's Architectures and Valid Architectures build settings are configured correctly for the iOS Simulator platform" CocoaPods/CocoaPods#9210.
Revert [google_maps_flutter] ios build fix #1734 to support modules.
Fix 35 analyzer warnings:

GoogleMapMarkerController.m:98:7: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
GoogleMapMarkerController.m:106:7: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
GoogleMapMarkerController.m:115:7: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
GoogleMapMarkerController.m:119:7: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
GoogleMapMarkerController.m:128:7: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
GoogleMapMarkerController.m:132:7: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
GoogleMapMarkerController.m:136:7: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
GoogleMapPolylineController.m:70:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (consumeTapEvents) {
  ~~~~^~~~~~~~~~~~~~~~~~~
GoogleMapPolylineController.m:75:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (visible) {
  ~~~~^~~~~~~~~~
GoogleMapPolylineController.m:80:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (zIndex) {
  ~~~~^~~~~~~~~
GoogleMapPolylineController.m:90:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (strokeColor) {
  ~~~~^~~~~~~~~~~~~~
GoogleMapPolylineController.m:95:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (strokeWidth) {
  ~~~~^~~~~~~~~~~~~~

GoogleMapPolygonController.m:73:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (consumeTapEvents) {
  ~~~~^~~~~~~~~~~~~~~~~~~
GoogleMapPolygonController.m:78:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (visible) {
  ~~~~^~~~~~~~~~
GoogleMapPolygonController.m:83:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (zIndex) {
  ~~~~^~~~~~~~~
GoogleMapPolygonController.m:93:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (fillColor) {
  ~~~~^~~~~~~~~~~~
GoogleMapPolygonController.m:98:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (strokeColor) {
  ~~~~^~~~~~~~~~~~~~
GoogleMapPolygonController.m:103:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (strokeWidth) {
  ~~~~^~~~~~~~~~~~~~
GoogleMapCircleController.m:76:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (consumeTapEvents) {
  ~~~~^~~~~~~~~~~~~~~~~~~
GoogleMapCircleController.m:81:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (visible) {
  ~~~~^~~~~~~~~~
GoogleMapCircleController.m:86:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (zIndex) {
  ~~~~^~~~~~~~~
GoogleMapCircleController.m:96:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (radius) {
  ~~~~^~~~~~~~~
GoogleMapCircleController.m:101:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (strokeColor) {
  ~~~~^~~~~~~~~~~~~~
GoogleMapCircleController.m:106:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (strokeWidth) {
  ~~~~^~~~~~~~~~~~~~
GoogleMapCircleController.m:111:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (fillColor) {
  ~~~~^~~~~~~~~~~~
GoogleMapController.m:69:5: warning: Instance variable used while 'self' is not set to the result of '[(super or self) init...]'
    _viewId = viewId;
    ^~~~~~~
GoogleMapController.m:118:3: warning: Returning 'self' while it is not set to the result of '[(super or self) init...]'
  return self;
  ^~~~~~~~~~~
GoogleMapController.m:546:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (compassEnabled) {
  ~~~~^~~~~~~~~~~~~~~~~
GoogleMapController.m:577:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (rotateGesturesEnabled) {
  ~~~~^~~~~~~~~~~~~~~~~~~~~~~~
GoogleMapController.m:581:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (scrollGesturesEnabled) {
  ~~~~^~~~~~~~~~~~~~~~~~~~~~~~
GoogleMapController.m:585:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (tiltGesturesEnabled) {
  ~~~~^~~~~~~~~~~~~~~~~~~~~~
GoogleMapController.m:589:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (trackCameraPosition) {
  ~~~~^~~~~~~~~~~~~~~~~~~~~~
GoogleMapController.m:593:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (zoomGesturesEnabled) {
  ~~~~^~~~~~~~~~~~~~~~~~~~~~
GoogleMapController.m:597:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (myLocationEnabled) {
  ~~~~^~~~~~~~~~~~~~~~~~~~
GoogleMapController.m:601:7: warning: Converting a pointer value of type 'NSNumber *' to a primitive boolean value; instead, either compare the pointer to nil or call -boolValue
  if (myLocationButtonEnabled) {
  ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~

Related Issues

See flutter/flutter#41007.
Might fix flutter/flutter#34042 (though I can't reproduce it)

Tests

Remove google_maps_flutter from the list of packages to skip when linting the podspec. This will at minimum make sure google_maps_flutter can be imported into a project without compilation errors.

Checklist

Breaking Change

Yes, this is a breaking change (please indicate a breaking change in CHANGELOG.md and increment major revision).
No, this is not a breaking change.

jmagman · 2019-10-11T23:28:30Z

packages/google_maps_flutter/ios/Classes/GoogleMapController.h

@@ -9,9 +9,11 @@
 #import "GoogleMapPolygonController.h"
 #import "GoogleMapPolylineController.h"

+NS_ASSUME_NONNULL_BEGIN


The id _Nullable below had opted this entire header into nullability, but it wasn't specified anywhere, which caused the analyzer warnings.

Ideally all headers would declare nullability, but I wanted to limit the scope of this change.

jmagman · 2019-10-11T23:29:15Z

packages/google_maps_flutter/ios/Classes/GoogleMapController.m

@@ -65,7 +65,7 @@ - (instancetype)initWithFrame:(CGRect)frame
               viewIdentifier:(int64_t)viewId
                    arguments:(id _Nullable)args
                    registrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-  if ([super init]) {
+  if (self = [super init]) {


jmagman · 2019-10-11T23:37:47Z

packages/google_maps_flutter/ios/google_maps_flutter.podspec

@@ -16,7 +16,7 @@ A new flutter plugin project.
  s.public_header_files = 'Classes/**/*.h'
  s.dependency 'Flutter'
  s.dependency 'GoogleMaps'
-  s.compiler_flags = '-fno-modules'


With this change I'm able to use module imports in a Swift and Objective-C app (building with libraries and frameworks). @iskakaushik I believe that's enough to prove I didn't regress #1734?

@import GoogleMapsBase; @import google_maps_flutter;

cyanglaz

LGTM!
@iskakaushik might want to chime in for the comment about using module imports.

iskakaushik

LGTM

…ngs (flutter#2182)

* newCache/blackVideos: (105 commits) [connectivity] Fix reachability stream for iOS (flutter#2281) [google_sign_in] Port plugin to use the federated Platform Interface (flutter#2266) [webview_flutter] Add async NavigationDelegates (flutter#2257) Update cirrus to create IOS simulator on 13.2 an xCode 11 (flutter#2275) [battery] Update and migrate iOS example project (flutter#2089) [url_launcher] DartDoc and test improvements (flutter#2274) [google_maps_flutter] Define clang module for iOS, fix analyzer warnings (flutter#2182) [video_player] Add v2 embedding support (flutter#2226) [path_provider] Update and migrate iOS example project (flutter#2099) [sensors] Documentation and test improvements (flutter#2272) [image_picker] Lint for public DartDocs (flutter#2270) [connectivity] Lint for public DartDocs (flutter#2269) [shared_preferences] Update and migrate iOS example project (flutter#2103) [quick_actions] Update and migrate iOS example project (flutter#2100) [infra] Ignore analyzer issues in CI (flutter#2271) [android_intent] Add missing DartDocs (flutter#2268) Bump google_maps_flutter pubspec to match CHANGELOG (flutter#2267) [google_sign_in] Handle new style URLs in GoogleUserCircleAvatar (flutter#2252) [google_sign_in] Move plugin to its subdir to allow for federated implementations. Add platform interface. (flutter#2244) Make setMockInitialValues handle non-prefixed keys (flutter#2260) ... # Conflicts: # packages/video_player/CHANGELOG.md # packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java # packages/video_player/ios/video_player.podspec # packages/video_player/pubspec.yaml # packages/video_player/test/video_player_test.dart

…ngs (flutter#2182)

jmagman requested a review from iskakaushik October 11, 2019 23:27

googlebot added the cla: yes label Oct 11, 2019

jmagman commented Oct 11, 2019

View reviewed changes

jmagman force-pushed the module-gmf branch from 7e7efa0 to 81221f6 Compare October 11, 2019 23:36

jmagman commented Oct 11, 2019

View reviewed changes

jmagman force-pushed the module-gmf branch 3 times, most recently from 2163b32 to 58a23f3 Compare October 14, 2019 21:40

jmagman mentioned this pull request Oct 16, 2019

Support clang modules in plugins flutter/flutter#41007

Closed

39 tasks

jmagman force-pushed the module-gmf branch from 58a23f3 to 144aa12 Compare November 4, 2019 23:13

jmagman added 2 commits November 12, 2019 15:50

[google_maps_flutter] Define clang module for iOS, fix analyzer warnings

f7b5804

Bump pubspec version

ec983c5

jmagman force-pushed the module-gmf branch from 144aa12 to ec983c5 Compare November 12, 2019 23:52

cyanglaz approved these changes Nov 13, 2019

View reviewed changes

iskakaushik approved these changes Nov 13, 2019

View reviewed changes

jmagman merged commit 56e46ac into flutter:master Nov 13, 2019

jmagman deleted the module-gmf branch November 13, 2019 21:06

mormih pushed a commit to mormih/plugins that referenced this pull request Nov 17, 2019

[google_maps_flutter] Define clang module for iOS, fix analyzer warni…

ff74a05

…ngs (flutter#2182)

sungmin-park pushed a commit to sungmin-park/flutter-plugins that referenced this pull request Dec 17, 2019

[google_maps_flutter] Define clang module for iOS, fix analyzer warni…

0834c76

…ngs (flutter#2182)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[google_maps_flutter] Define clang module for iOS, fix analyzer warnings #2182

[google_maps_flutter] Define clang module for iOS, fix analyzer warnings #2182

Uh oh!

jmagman commented Oct 11, 2019

Uh oh!

jmagman Oct 11, 2019 •

edited

Loading

Uh oh!

jmagman Oct 11, 2019

Uh oh!

jmagman Oct 11, 2019

Uh oh!

cyanglaz left a comment

Uh oh!

iskakaushik left a comment

Uh oh!

Uh oh!

[google_maps_flutter] Define clang module for iOS, fix analyzer warnings #2182

[google_maps_flutter] Define clang module for iOS, fix analyzer warnings #2182

Uh oh!

Conversation

jmagman commented Oct 11, 2019

Description

Related Issues

Tests

Checklist

Breaking Change

Uh oh!

jmagman Oct 11, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jmagman Oct 11, 2019

Choose a reason for hiding this comment

Uh oh!

jmagman Oct 11, 2019

Choose a reason for hiding this comment

Uh oh!

cyanglaz left a comment

Choose a reason for hiding this comment

Uh oh!

iskakaushik left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jmagman Oct 11, 2019 •

edited

Loading