diff --git a/CHANGELOG.md b/CHANGELOG.md index 31d089e..c3a8c5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.6 + +* Return `null` on platforms other than Android, instead of throwing an exception + ## 0.3.5 * Maintenance release diff --git a/example/pubspec.lock b/example/pubspec.lock index b64753d..b70654c 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,7 +7,7 @@ packages: path: ".." relative: true source: path - version: "0.3.5" + version: "0.3.6" async: dependency: transitive description: @@ -44,10 +44,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" fake_async: dependency: transitive description: @@ -74,14 +74,6 @@ packages: description: flutter source: sdk version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" lints: dependency: transitive description: @@ -94,18 +86,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -131,10 +123,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -171,10 +163,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" vector_math: dependency: transitive description: @@ -183,6 +175,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=2.0.0" diff --git a/lib/android_id.dart b/lib/android_id.dart index e9aa307..4101bac 100644 --- a/lib/android_id.dart +++ b/lib/android_id.dart @@ -1,3 +1,4 @@ +import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; /// The plugin class for retrieving the Android ID. @@ -8,5 +9,10 @@ class AndroidId { static const _methodChannel = MethodChannel('android_id'); /// Calls the native method to retrieve the Android ID. - Future getId() => _methodChannel.invokeMethod('getId'); + Future getId() async { + final isAndroid = defaultTargetPlatform == TargetPlatform.android; + if (!isAndroid) return null; + + return _methodChannel.invokeMethod('getId'); + } } diff --git a/pubspec.yaml b/pubspec.yaml index 224c015..e79d237 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,7 +13,7 @@ topics: - android - native -version: 0.3.5 +version: 0.3.6 environment: sdk: '>=2.12.0 <4.0.0' diff --git a/test/android_id_test.dart b/test/android_id_test.dart index 876080b..8c015e6 100644 --- a/test/android_id_test.dart +++ b/test/android_id_test.dart @@ -1,4 +1,5 @@ import 'package:android_id/android_id.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -7,11 +8,11 @@ void main() { const channel = MethodChannel('android_id'); TestWidgetsFlutterBinding.ensureInitialized(); + debugDefaultTargetPlatformOverride = TargetPlatform.android; setUp(() { TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger - .setMockMethodCallHandler( - channel, (MethodCall methodCall) async => '42'); + .setMockMethodCallHandler(channel, (methodCall) async => '42'); }); tearDown(() {