[ffigen] Prepare to publish v18 (#2083)

Author: liamappelbe

pkgs/ffigen/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 18.0.0-wip
+## 18.0.0
 
 - Add variable substitutions that can be used in the `headers.entry-points` to
   locate Apple APIs: `$XCODE`, `$IOS_SDK`, and `$MACOS_SDK`.

pkgs/ffigen/lib/src/code_generator/objc_built_in_functions.dart

@@ -47,7 +47,7 @@ class ObjCBuiltInFunctions {
   static const protocolBuilder = ObjCImport('ObjCProtocolBuilder');
   static const unimplementedOptionalMethodException =
       ObjCImport('UnimplementedOptionalMethodException');
-  static const checkOsVersion = ObjCImport('checkOsVersion');
+  static const checkOsVersion = ObjCImport('checkOsVersionInternal');
 
   // Keep in sync with pkgs/objective_c/ffigen_objc.yaml.
 

pkgs/ffigen/pubspec.yaml

@@ -3,7 +3,7 @@
 # BSD-style license that can be found in the LICENSE file.
 
 name: ffigen
-version: 18.0.0-wip
+version: 18.0.0
 description: >
   Generator for FFI bindings, using LibClang to parse C, Objective-C, and Swift
   files.

pkgs/objective_c/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 7.0.0-wip
+## 7.0.0
 
 - Use ffigen 18.0.0
 - `ObjCProtocolBuilder` supports implementing protocol methods directly using a
@@ -15,6 +15,7 @@
 - __Breaking change__: Some API names have changed due to ffigen's new duplicate
   identifier renaming logic. `$` is now used as a delimiter, to match jnigen's
   renaming logic.
+- Added a `checkOsVersion` function.
 
 ## 6.0.0
 

pkgs/objective_c/lib/src/objective_c_bindings_generated.dart

@@ -7,13 +7,32 @@ import 'package:pub_semver/pub_semver.dart';
 
 import 'c_bindings_generated.dart' as c;
 
+/// Returns the current MacOS/iOS version.
 Version get osVersion => _osVersion;
 
 Version _osVersion = () {
   final ver = c.getOsVesion();
   return Version(ver.major, ver.minor, ver.patch);
 }();
 
+/// Returns whether the current MacOS/iOS version is greater than or equal to
+/// the given version.
+///
+/// Designed to replace Objective-C's `@available` check.
+///
+/// The each platform's version is optional, and the function returns false if
+/// no version is provided for the current platform.
+bool checkOSVersion({Version? iOS, Version? macOS}) {
+  if (Platform.isIOS) return _checkOSVersionImpl(iOS);
+  if (Platform.isMacOS) return _checkOSVersionImpl(macOS);
+  throw UnsupportedError('Only supported on iOS and macOS');
+}
+
+bool _checkOSVersionImpl(Version? version) {
+  if (version == null) return false;
+  return osVersion >= version;
+}
+
 final class OsVersionError implements Exception {
   final String apiName;
   final String message;
@@ -26,16 +45,16 @@ final class OsVersionError implements Exception {
 typedef PlatformAvailability = (bool unavailable, (int, int, int)? introduced);
 
 /// Only for use by ffigen bindings.
-void checkOsVersion(
+void checkOsVersionInternal(
   String apiName, {
   PlatformAvailability? iOS,
   PlatformAvailability? macOS,
 }) {
-  if (Platform.isIOS) _checkOsVersionImpl(apiName, 'iOS', iOS);
-  if (Platform.isMacOS) _checkOsVersionImpl(apiName, 'macOS', macOS);
+  if (Platform.isIOS) _checkOsVersionInternalImpl(apiName, 'iOS', iOS);
+  if (Platform.isMacOS) _checkOsVersionInternalImpl(apiName, 'macOS', macOS);
 }
 
-void _checkOsVersionImpl(
+void _checkOsVersionInternalImpl(
     String apiName, String osName, PlatformAvailability? availability) {
   if (availability == null) return;
   final (bool unavailable, (int, int, int)? introduced) = availability;

pkgs/objective_c/lib/src/os_version.dart

@@ -4,7 +4,7 @@
 
 name: objective_c
 description: 'A library to access Objective C from Flutter that acts as a support library for package:ffigen.'
-version: 7.0.0-wip
+version: 7.0.0
 repository: https://github.com/dart-lang/native/tree/main/pkgs/objective_c
 issue_tracker: https://github.com/dart-lang/native/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Aobjective_c
 

pkgs/objective_c/pubspec.yaml

@@ -23,5 +23,16 @@ void main() {
       final oldVersion = Version(11, 0, 0);
       expect(osVersion, greaterThan(oldVersion));
     });
+
+    test('check', () {
+      // This test is only run on macOS.
+      expect(checkOSVersion(iOS: Version(1, 0, 0)), isFalse);
+      expect(checkOSVersion(iOS: Version(1, 0, 0), macOS: Version(11, 0, 0)),
+          isTrue);
+      expect(checkOSVersion(iOS: Version(1, 0, 0), macOS: Version(1000, 0, 0)),
+          isFalse);
+      expect(checkOSVersion(macOS: Version(11, 0, 0)), isTrue);
+      expect(checkOSVersion(macOS: Version(1000, 0, 0)), isFalse);
+    });
   });
 }