Fix lints in package:objective_c (#1326)

Author: liamappelbe

pkgs/objective_c/analysis_options.yaml

@@ -9,14 +9,3 @@ analyzer:
     strict-casts: true
     strict-inference: true
     strict-raw-types: true
-
-linter:
-  rules:
-    avoid_dynamic_calls: false # TODO(https://github.com/dart-lang/native/issues/1280): Fix
-    combinators_ordering: false # TODO(https://github.com/dart-lang/native/issues/1280): Fix.
-    comment_references: false # TODO(https://github.com/dart-lang/native/issues/1280): Fix
-    directives_ordering: false # TODO(https://github.com/dart-lang/native/issues/1280): Fix
-    library_annotations: false # TODO(https://github.com/dart-lang/native/issues/1280): Fix
-    omit_local_variable_types: false # TODO(https://github.com/dart-lang/native/issues/1280): Fix
-    prefer_single_quotes: false # TODO(https://github.com/dart-lang/native/issues/1280): Fix
-    sort_pub_dependencies: false # TODO(https://github.com/dart-lang/native/issues/1280): Fix

pkgs/objective_c/example/pubspec.lock

@@ -219,10 +219,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
+      sha256: "360c4271613beb44db559547d02f8b0dc044741d0eeb9aa6ccdb47e8ec54c63a"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.4"
+    version: "14.2.3"
   yaml:
     dependency: transitive
     description:

pkgs/objective_c/lib/objective_c.dart

@@ -2,21 +2,19 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-export 'src/internal.dart' hide blockHasRegisteredClosure;
-export 'src/ns_data.dart';
-export 'src/ns_mutable_data.dart';
-export 'src/ns_string.dart';
-export 'src/protocol_builder.dart';
 export 'src/c_bindings_generated.dart'
     show
-        ObjCSelector,
-        ObjCObject,
         ObjCBlock,
-        objectRetain,
-        objectRelease,
+        ObjCObject,
+        ObjCSelector,
         blockCopy,
-        blockRelease;
-
+        blockRelease,
+        objectRelease,
+        objectRetain;
+export 'src/internal.dart' hide blockHasRegisteredClosure;
+export 'src/ns_data.dart';
+export 'src/ns_mutable_data.dart';
+export 'src/ns_string.dart';
 // Keep in sync with pkgs/objective_c/ffigen_objc.yaml.
 export 'src/objective_c_bindings_generated.dart'
     show
@@ -72,3 +70,4 @@ export 'src/objective_c_bindings_generated.dart'
         NSURLHandleStatus,
         NSValue,
         Protocol;
+export 'src/protocol_builder.dart';

pkgs/objective_c/lib/src/internal.dart

@@ -176,7 +176,7 @@ bool _isValidClass(Pointer<c.ObjCObject> clazz) {
   final count = countPtr.value;
   calloc.free(countPtr);
   _allClasses.clear();
-  for (int i = 0; i < count; ++i) {
+  for (var i = 0; i < count; ++i) {
     _allClasses.add(classList[i]);
   }
   calloc.free(classList);
@@ -267,7 +267,7 @@ final _blockClosureDisposer = () {
     final id = msg as int;
     assert(_blockClosureRegistry.containsKey(id));
     _blockClosureRegistry.remove(id);
-  }, "ObjCBlockClosureDisposer")
+  }, 'ObjCBlockClosureDisposer')
     ..keepIsolateAlive = false;
 }();
 
@@ -280,7 +280,7 @@ Pointer<Void> _registerBlockClosure(Function closure) {
 
 /// Only for use by ffigen bindings.
 Function getBlockClosure(Pointer<c.ObjCBlock> block) {
-  int id = block.ref.target.address;
+  var id = block.ref.target.address;
   assert(_blockClosureRegistry.containsKey(id));
   return _blockClosureRegistry[id]!;
 }

pkgs/objective_c/lib/src/protocol_builder.dart

@@ -5,8 +5,8 @@
 import 'dart:ffi';
 
 import 'c_bindings_generated.dart' as c;
-import 'objective_c_bindings_generated.dart' as objc;
 import 'internal.dart' show ObjCBlockBase;
+import 'objective_c_bindings_generated.dart' as objc;
 
 /// Helper class for building Objective C objects that implement protocols.
 class ObjCProtocolBuilder {
@@ -45,8 +45,8 @@ class ObjCProtocolMethod<T extends Function> {
   /// Implement this method on the protocol [builder] using a Dart [function].
   ///
   /// The implemented method must be invoked by ObjC code running on the same
-  /// thread as the isolate that called [implementMethod]. Invoking the method
-  /// on the wrong thread will result in a crash.
+  /// thread as the isolate that called implementMethod. Invoking the method on
+  /// the wrong thread will result in a crash.
   void implement(ObjCProtocolBuilder builder, T? function) {
     if (function != null) {
       builder.implementMethod(_sel, _signature, _createBlock(function));

pkgs/objective_c/pubspec.yaml

@@ -18,19 +18,19 @@ environment:
   flutter: '>=3.3.0'
 
 dependencies:
+  ffi: ^2.1.0
   flutter:
     sdk: flutter
-  ffi: ^2.1.0
   plugin_platform_interface: ^2.0.2
   yaml: ^3.1.0
 
 dev_dependencies:
   coverage: ^1.8.0
   dart_flutter_team_lints: ^2.0.0
   ffigen: ^12.0.0
+  flutter_lints: ^3.0.0
   flutter_test:
     sdk: flutter
-  flutter_lints: ^3.0.0
   test: ^1.21.1
 
 dependency_overrides:

pkgs/objective_c/test/generate_code_test.dart

@@ -4,6 +4,7 @@
 
 // Objective C support is only available on mac.
 @TestOn('mac-os')
+library;
 
 import 'dart:io';
 

pkgs/objective_c/test/interface_lists_test.dart

@@ -4,6 +4,7 @@
 
 // Objective C support is only available on mac.
 @TestOn('mac-os')
+library;
 
 import 'dart:io';
 
@@ -18,20 +19,22 @@ void main() {
     late List<String> yamlEnums;
 
     setUpAll(() {
-      final yaml = loadYaml(File('ffigen_objc.yaml').readAsStringSync());
-      yamlInterfaces = yaml['objc-interfaces']['include']
+      final yaml =
+          loadYaml(File('ffigen_objc.yaml').readAsStringSync()) as YamlMap;
+      yamlInterfaces = ((yaml['objc-interfaces'] as YamlMap)['include']
+              as YamlList)
           .map<String>((dynamic i) => i as String)
-          .toList() as List<String>
+          .toList()
         ..sort();
-      final structRenames = yaml['structs']['rename'];
-      yamlStructs = yaml['structs']['include']
+      final structRenames = (yaml['structs'] as YamlMap)['rename'] as YamlMap;
+      yamlStructs = ((yaml['structs'] as YamlMap)['include'] as YamlList)
           .map<String>(
               (dynamic name) => (structRenames[name] ?? name) as String)
-          .toList() as List<String>
+          .toList()
         ..sort();
-      yamlEnums = yaml['enums']['include']
+      yamlEnums = ((yaml['enums'] as YamlMap)['include'] as YamlList)
           .map<String>((dynamic i) => i as String)
-          .toList() as List<String>
+          .toList()
         ..sort();
     });
 

pkgs/objective_c/test/ns_mutable_data_test.dart

@@ -4,6 +4,7 @@
 
 // Objective C support is only available on mac.
 @TestOn('mac-os')
+library;
 
 import 'dart:ffi';
 

pkgs/objective_c/test/nsdata_test.dart

@@ -4,6 +4,7 @@
 
 // Objective C support is only available on mac.
 @TestOn('mac-os')
+library;
 
 import 'dart:ffi';