From 6c224add156b4cd5e2ab0da2be3a9fc41e67146f Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 07:38:55 +0100 Subject: [PATCH 01/10] renamed Android classes and platform interface channel --- .../android/src/main/AndroidManifest.xml | 2 +- .../packageinfo/PackageInfoPlugin.java | 79 ------------------- .../EmbedderV1Activity.java | 4 +- .../ios/Classes/FLTPackageInfoPlugin.m | 2 +- packages/package_info_plus/pubspec.yaml | 14 ++-- .../test/package_info_test.dart | 2 +- .../macos/Classes/FLTPackageInfoPlugin.m | 2 +- .../lib/method_channel_package_info.dart | 2 +- .../method_channel_package_info_test.dart | 2 +- packages/package_info_plus_web/pubspec.yaml | 3 +- .../package_info_plus_windows/pubspec.yaml | 3 +- 11 files changed, 21 insertions(+), 94 deletions(-) delete mode 100644 packages/package_info_plus/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java diff --git a/packages/package_info_plus/android/src/main/AndroidManifest.xml b/packages/package_info_plus/android/src/main/AndroidManifest.xml index 133ae5faf3..96f347ed64 100644 --- a/packages/package_info_plus/android/src/main/AndroidManifest.xml +++ b/packages/package_info_plus/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="dev.fluttercommunity.plus.packageinfo"> diff --git a/packages/package_info_plus/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java deleted file mode 100644 index ca10414672..0000000000 --- a/packages/package_info_plus/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -package io.flutter.plugins.packageinfo; - -import android.content.Context; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.os.Build; -import io.flutter.embedding.engine.plugins.FlutterPlugin; -import io.flutter.plugin.common.BinaryMessenger; -import io.flutter.plugin.common.MethodCall; -import io.flutter.plugin.common.MethodChannel; -import io.flutter.plugin.common.MethodChannel.MethodCallHandler; -import io.flutter.plugin.common.MethodChannel.Result; -import io.flutter.plugin.common.PluginRegistry.Registrar; -import java.util.HashMap; -import java.util.Map; - -/** PackageInfoPlugin */ -public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { - private Context applicationContext; - private MethodChannel methodChannel; - - /** Plugin registration. */ - public static void registerWith(Registrar registrar) { - final PackageInfoPlugin instance = new PackageInfoPlugin(); - instance.onAttachedToEngine(registrar.context(), registrar.messenger()); - } - - @Override - public void onAttachedToEngine(FlutterPluginBinding binding) { - onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); - } - - private void onAttachedToEngine(Context applicationContext, BinaryMessenger messenger) { - this.applicationContext = applicationContext; - methodChannel = new MethodChannel(messenger, "plugins.flutter.io/package_info"); - methodChannel.setMethodCallHandler(this); - } - - @Override - public void onDetachedFromEngine(FlutterPluginBinding binding) { - applicationContext = null; - methodChannel.setMethodCallHandler(null); - methodChannel = null; - } - - @Override - public void onMethodCall(MethodCall call, Result result) { - try { - if (call.method.equals("getAll")) { - PackageManager pm = applicationContext.getPackageManager(); - PackageInfo info = pm.getPackageInfo(applicationContext.getPackageName(), 0); - - Map map = new HashMap<>(); - map.put("appName", info.applicationInfo.loadLabel(pm).toString()); - map.put("packageName", applicationContext.getPackageName()); - map.put("version", info.versionName); - map.put("buildNumber", String.valueOf(getLongVersionCode(info))); - - result.success(map); - } else { - result.notImplemented(); - } - } catch (PackageManager.NameNotFoundException ex) { - result.error("Name not found", ex.getMessage(), null); - } - } - - @SuppressWarnings("deprecation") - private static long getLongVersionCode(PackageInfo info) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - return info.getLongVersionCode(); - } - return info.versionCode; - } -} diff --git a/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java b/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java index a32c504848..e01a95bb1e 100644 --- a/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java +++ b/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java @@ -6,13 +6,13 @@ import android.os.Bundle; import io.flutter.app.FlutterActivity; -import io.flutter.plugins.packageinfo.PackageInfoPlugin; +import dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin; public class EmbedderV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); PackageInfoPlugin.registerWith( - registrarFor("io.flutter.plugins.packageinfo.PackageInfoPlugin")); + registrarFor("dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin")); } } diff --git a/packages/package_info_plus/ios/Classes/FLTPackageInfoPlugin.m b/packages/package_info_plus/ios/Classes/FLTPackageInfoPlugin.m index 046f15fec3..9c3e269a96 100644 --- a/packages/package_info_plus/ios/Classes/FLTPackageInfoPlugin.m +++ b/packages/package_info_plus/ios/Classes/FLTPackageInfoPlugin.m @@ -7,7 +7,7 @@ @implementation FLTPackageInfoPlugin + (void)registerWithRegistrar:(NSObject*)registrar { FlutterMethodChannel* channel = - [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/package_info" + [FlutterMethodChannel methodChannelWithName:@"dev.fluttercommunity.plus/package_info" binaryMessenger:[registrar messenger]]; FLTPackageInfoPlugin* instance = [[FLTPackageInfoPlugin alloc] init]; [registrar addMethodCallDelegate:instance channel:channel]; diff --git a/packages/package_info_plus/pubspec.yaml b/packages/package_info_plus/pubspec.yaml index db005ac861..6e11f521c0 100644 --- a/packages/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/pubspec.yaml @@ -8,7 +8,7 @@ flutter: plugin: platforms: android: - package: io.flutter.plugins.packageinfo + package: dev.fluttercommunity.plus.packageinfo pluginClass: PackageInfoPlugin ios: pluginClass: FLTPackageInfoPlugin @@ -22,10 +22,14 @@ flutter: dependencies: flutter: sdk: flutter - package_info_plus_platform_interface: ^0.1.0 - package_info_plus_web: ^0.1.0 - package_info_plus_macos: ^0.1.0 - package_info_plus_windows: ^0.1.0 + package_info_plus_platform_interface: + path: ../package_info_plus_platform_interface + package_info_plus_web: + path: ../package_info_plus_web + package_info_plus_macos: + path: ../package_info_plus_macos + package_info_plus_windows: + path: ../package_info_plus_windows dev_dependencies: flutter_test: diff --git a/packages/package_info_plus/test/package_info_test.dart b/packages/package_info_plus/test/package_info_test.dart index 29af1a0a62..21efb734a4 100644 --- a/packages/package_info_plus/test/package_info_test.dart +++ b/packages/package_info_plus/test/package_info_test.dart @@ -10,7 +10,7 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); const MethodChannel channel = - MethodChannel('plugins.flutter.io/package_info'); + MethodChannel('dev.fluttercommunity.plus/package_info'); List log; channel.setMockMethodCallHandler((MethodCall methodCall) async { diff --git a/packages/package_info_plus_macos/macos/Classes/FLTPackageInfoPlugin.m b/packages/package_info_plus_macos/macos/Classes/FLTPackageInfoPlugin.m index 046f15fec3..9c3e269a96 100644 --- a/packages/package_info_plus_macos/macos/Classes/FLTPackageInfoPlugin.m +++ b/packages/package_info_plus_macos/macos/Classes/FLTPackageInfoPlugin.m @@ -7,7 +7,7 @@ @implementation FLTPackageInfoPlugin + (void)registerWithRegistrar:(NSObject*)registrar { FlutterMethodChannel* channel = - [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/package_info" + [FlutterMethodChannel methodChannelWithName:@"dev.fluttercommunity.plus/package_info" binaryMessenger:[registrar messenger]]; FLTPackageInfoPlugin* instance = [[FLTPackageInfoPlugin alloc] init]; [registrar addMethodCallDelegate:instance channel:channel]; diff --git a/packages/package_info_plus_platform_interface/lib/method_channel_package_info.dart b/packages/package_info_plus_platform_interface/lib/method_channel_package_info.dart index 04ab631fb5..d81f2a180b 100644 --- a/packages/package_info_plus_platform_interface/lib/method_channel_package_info.dart +++ b/packages/package_info_plus_platform_interface/lib/method_channel_package_info.dart @@ -3,7 +3,7 @@ import 'package:package_info_plus_platform_interface/package_info_data.dart'; import 'package_info_platform_interface.dart'; -const MethodChannel _channel = MethodChannel('plugins.flutter.io/package_info'); +const MethodChannel _channel = MethodChannel('dev.fluttercommunity.plus/package_info'); /// An implementation of [PackageInfoPlatform] that uses method channels. class MethodChannelPackageInfo extends PackageInfoPlatform { diff --git a/packages/package_info_plus_platform_interface/test/method_channel_package_info_test.dart b/packages/package_info_plus_platform_interface/test/method_channel_package_info_test.dart index 84e34efbd5..57a5d3fefa 100644 --- a/packages/package_info_plus_platform_interface/test/method_channel_package_info_test.dart +++ b/packages/package_info_plus_platform_interface/test/method_channel_package_info_test.dart @@ -36,7 +36,7 @@ void main() { group('$MethodChannelPackageInfo()', () { const MethodChannel channel = - MethodChannel('plugins.flutter.io/package_info'); + MethodChannel('dev.fluttercommunity.plus/package_info'); final List log = []; channel.setMockMethodCallHandler((MethodCall methodCall) async { log.add(methodCall); diff --git a/packages/package_info_plus_web/pubspec.yaml b/packages/package_info_plus_web/pubspec.yaml index ffbe3ba270..f2d9c12f7d 100644 --- a/packages/package_info_plus_web/pubspec.yaml +++ b/packages/package_info_plus_web/pubspec.yaml @@ -13,7 +13,8 @@ flutter: dependencies: http: ^0.12.0 - package_info_plus_platform_interface: ^0.1.0 + package_info_plus_platform_interface: + path: ../package_info_plus_platform_interface platform_detect: ^1.4.0 flutter: sdk: flutter diff --git a/packages/package_info_plus_windows/pubspec.yaml b/packages/package_info_plus_windows/pubspec.yaml index ffadd64868..9364bad7bc 100644 --- a/packages/package_info_plus_windows/pubspec.yaml +++ b/packages/package_info_plus_windows/pubspec.yaml @@ -9,7 +9,8 @@ environment: flutter: ">=1.17.0 <2.0.0" dependencies: - package_info_plus_platform_interface: ^0.1.0 + package_info_plus_platform_interface: + path: ../package_info_plus_platform_interface ffi: ^0.1.3 flutter: sdk: flutter From a1fd69e36ab9bf1c2e554640fc3897b16e28c224 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 07:39:08 +0100 Subject: [PATCH 02/10] add missing files --- .../plus/packageinfo/PackageInfoPlugin.java | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 packages/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java diff --git a/packages/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java new file mode 100644 index 0000000000..8808a6e622 --- /dev/null +++ b/packages/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -0,0 +1,79 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package dev.fluttercommunity.plus.packageinfo; + +import android.content.Context; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.os.Build; +import io.flutter.embedding.engine.plugins.FlutterPlugin; +import io.flutter.plugin.common.BinaryMessenger; +import io.flutter.plugin.common.MethodCall; +import io.flutter.plugin.common.MethodChannel; +import io.flutter.plugin.common.MethodChannel.MethodCallHandler; +import io.flutter.plugin.common.MethodChannel.Result; +import io.flutter.plugin.common.PluginRegistry.Registrar; +import java.util.HashMap; +import java.util.Map; + +/** PackageInfoPlugin */ +public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { + private Context applicationContext; + private MethodChannel methodChannel; + + /** Plugin registration. */ + public static void registerWith(Registrar registrar) { + final PackageInfoPlugin instance = new PackageInfoPlugin(); + instance.onAttachedToEngine(registrar.context(), registrar.messenger()); + } + + @Override + public void onAttachedToEngine(FlutterPluginBinding binding) { + onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); + } + + private void onAttachedToEngine(Context applicationContext, BinaryMessenger messenger) { + this.applicationContext = applicationContext; + methodChannel = new MethodChannel(messenger, "dev.fluttercommunity.plus/package_info"); + methodChannel.setMethodCallHandler(this); + } + + @Override + public void onDetachedFromEngine(FlutterPluginBinding binding) { + applicationContext = null; + methodChannel.setMethodCallHandler(null); + methodChannel = null; + } + + @Override + public void onMethodCall(MethodCall call, Result result) { + try { + if (call.method.equals("getAll")) { + PackageManager pm = applicationContext.getPackageManager(); + PackageInfo info = pm.getPackageInfo(applicationContext.getPackageName(), 0); + + Map map = new HashMap<>(); + map.put("appName", info.applicationInfo.loadLabel(pm).toString()); + map.put("packageName", applicationContext.getPackageName()); + map.put("version", info.versionName); + map.put("buildNumber", String.valueOf(getLongVersionCode(info))); + + result.success(map); + } else { + result.notImplemented(); + } + } catch (PackageManager.NameNotFoundException ex) { + result.error("Name not found", ex.getMessage(), null); + } + } + + @SuppressWarnings("deprecation") + private static long getLongVersionCode(PackageInfo info) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + return info.getLongVersionCode(); + } + return info.versionCode; + } +} From fad9821c9a5db81db85b1f64927228e71f4c78fb Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 08:23:59 +0100 Subject: [PATCH 03/10] format --- .../lib/method_channel_package_info.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/package_info_plus_platform_interface/lib/method_channel_package_info.dart b/packages/package_info_plus_platform_interface/lib/method_channel_package_info.dart index d81f2a180b..ee310992f7 100644 --- a/packages/package_info_plus_platform_interface/lib/method_channel_package_info.dart +++ b/packages/package_info_plus_platform_interface/lib/method_channel_package_info.dart @@ -3,7 +3,8 @@ import 'package:package_info_plus_platform_interface/package_info_data.dart'; import 'package_info_platform_interface.dart'; -const MethodChannel _channel = MethodChannel('dev.fluttercommunity.plus/package_info'); +const MethodChannel _channel = + MethodChannel('dev.fluttercommunity.plus/package_info'); /// An implementation of [PackageInfoPlatform] that uses method channels. class MethodChannelPackageInfo extends PackageInfoPlatform { From 238913ad4d796921ebea3d150e26ba3160517220 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 08:24:09 +0100 Subject: [PATCH 04/10] add missing environment --- packages/package_info_plus/example/pubspec.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/package_info_plus/example/pubspec.yaml b/packages/package_info_plus/example/pubspec.yaml index ddacb6a0c1..d873c60d37 100644 --- a/packages/package_info_plus/example/pubspec.yaml +++ b/packages/package_info_plus/example/pubspec.yaml @@ -1,5 +1,9 @@ name: package_info_example description: Demonstrates how to use the package_info_plus plugin. + +environment: + sdk: '>=2.10.0 <3.0.0' + dependencies: flutter: sdk: flutter From 80524217cd3762e6b68e55fa5dcba183fc3df130 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 08:34:13 +0100 Subject: [PATCH 05/10] formats --- .../plus/packageinfo/PackageInfoPlugin.java | 10 ++++++++-- .../plugins/packageinfoexample/EmbedderV1Activity.java | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java index 8808a6e622..eb75ac501d 100644 --- a/packages/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -8,6 +8,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; + import io.flutter.embedding.engine.plugins.FlutterPlugin; import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.MethodCall; @@ -15,15 +16,20 @@ import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; import io.flutter.plugin.common.PluginRegistry.Registrar; + import java.util.HashMap; import java.util.Map; -/** PackageInfoPlugin */ +/** + * PackageInfoPlugin + */ public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { private Context applicationContext; private MethodChannel methodChannel; - /** Plugin registration. */ + /** + * Plugin registration. + */ public static void registerWith(Registrar registrar) { final PackageInfoPlugin instance = new PackageInfoPlugin(); instance.onAttachedToEngine(registrar.context(), registrar.messenger()); diff --git a/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java b/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java index e01a95bb1e..7662d9512d 100644 --- a/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java +++ b/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java @@ -5,6 +5,7 @@ package io.flutter.plugins.packageinfoexample; import android.os.Bundle; + import io.flutter.app.FlutterActivity; import dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin; @@ -13,6 +14,6 @@ public class EmbedderV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); PackageInfoPlugin.registerWith( - registrarFor("dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin")); + registrarFor("dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin")); } } From c24f9ee2e487ea0c65ce889ddd18512b0c48ef6e Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 08:39:42 +0100 Subject: [PATCH 06/10] new versions for package_info_plus --- packages/package_info_plus/CHANGELOG.md | 5 +++++ packages/package_info_plus/pubspec.yaml | 2 +- packages/package_info_plus_macos/CHANGELOG.md | 4 ++++ packages/package_info_plus_macos/pubspec.yaml | 2 +- packages/package_info_plus_platform_interface/CHANGELOG.md | 4 ++++ packages/package_info_plus_platform_interface/pubspec.yaml | 2 +- 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/package_info_plus/CHANGELOG.md b/packages/package_info_plus/CHANGELOG.md index 76c53318c8..166df53d67 100644 --- a/packages/package_info_plus/CHANGELOG.md +++ b/packages/package_info_plus/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.6.0 + +- Changed method channel name +- Moved Java files to different java package to avoid issues with package_info + ## 0.5.0 - Transfer to plus-plugins monorepo diff --git a/packages/package_info_plus/pubspec.yaml b/packages/package_info_plus/pubspec.yaml index 6e11f521c0..c7fcf20e6c 100644 --- a/packages/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: package_info_plus description: Flutter plugin for querying information about the application package, such as CFBundleVersion on iOS or versionCode on Android. -version: 0.5.0 +version: 0.6.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/package_info_plus_macos/CHANGELOG.md b/packages/package_info_plus_macos/CHANGELOG.md index 09dfb41b7a..27b8e13018 100644 --- a/packages/package_info_plus_macos/CHANGELOG.md +++ b/packages/package_info_plus_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.0 + +- Changed method channel name + ## 0.1.0 - Transfer to plus-plugins monorepo diff --git a/packages/package_info_plus_macos/pubspec.yaml b/packages/package_info_plus_macos/pubspec.yaml index 65b5d2ca29..43279f1d5c 100644 --- a/packages/package_info_plus_macos/pubspec.yaml +++ b/packages/package_info_plus_macos/pubspec.yaml @@ -1,6 +1,6 @@ name: package_info_plus_macos description: macOS implementation of the package_info_plus plugin. -version: 0.1.0 +version: 0.2.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/package_info_plus_platform_interface/CHANGELOG.md b/packages/package_info_plus_platform_interface/CHANGELOG.md index 2d7342abee..ef379be290 100644 --- a/packages/package_info_plus_platform_interface/CHANGELOG.md +++ b/packages/package_info_plus_platform_interface/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.0 + +- Changed method channel name + ## 0.2.0 - Transfer to plus-plugins monorepo diff --git a/packages/package_info_plus_platform_interface/pubspec.yaml b/packages/package_info_plus_platform_interface/pubspec.yaml index af28ac248b..5421892ea9 100644 --- a/packages/package_info_plus_platform_interface/pubspec.yaml +++ b/packages/package_info_plus_platform_interface/pubspec.yaml @@ -1,6 +1,6 @@ name: package_info_plus_platform_interface description: A common platform interface for the package_info_plus plugin. -version: 0.1.0 +version: 0.3.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ From 7b47d2216a3e12d4a5e0d89bba403038db211031 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 08:46:55 +0100 Subject: [PATCH 07/10] java formatter as it should be --- .../plus/packageinfo/PackageInfoPlugin.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java index eb75ac501d..8808a6e622 100644 --- a/packages/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -8,7 +8,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; - import io.flutter.embedding.engine.plugins.FlutterPlugin; import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.MethodCall; @@ -16,20 +15,15 @@ import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; import io.flutter.plugin.common.PluginRegistry.Registrar; - import java.util.HashMap; import java.util.Map; -/** - * PackageInfoPlugin - */ +/** PackageInfoPlugin */ public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { private Context applicationContext; private MethodChannel methodChannel; - /** - * Plugin registration. - */ + /** Plugin registration. */ public static void registerWith(Registrar registrar) { final PackageInfoPlugin instance = new PackageInfoPlugin(); instance.onAttachedToEngine(registrar.context(), registrar.messenger()); From a771aa34c68977b5e3f80e80644bd7ef611e98c2 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 08:50:15 +0100 Subject: [PATCH 08/10] java formatter as it should be --- .../flutter/plugins/packageinfoexample/EmbedderV1Activity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java b/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java index 7662d9512d..e01a95bb1e 100644 --- a/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java +++ b/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java @@ -5,7 +5,6 @@ package io.flutter.plugins.packageinfoexample; import android.os.Bundle; - import io.flutter.app.FlutterActivity; import dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin; @@ -14,6 +13,6 @@ public class EmbedderV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); PackageInfoPlugin.registerWith( - registrarFor("dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin")); + registrarFor("dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin")); } } From 18d187caa3474f9ea5c12f8ed78416c1e4e8b072 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 08:54:02 +0100 Subject: [PATCH 09/10] java formatter as it should be --- .../flutter/plugins/packageinfoexample/EmbedderV1Activity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java b/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java index e01a95bb1e..ccc1f20a71 100644 --- a/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java +++ b/packages/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java @@ -5,8 +5,8 @@ package io.flutter.plugins.packageinfoexample; import android.os.Bundle; -import io.flutter.app.FlutterActivity; import dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin; +import io.flutter.app.FlutterActivity; public class EmbedderV1Activity extends FlutterActivity { @Override From 9f523d7c7cac08ffc5ca9e8d7b61d3ac9cdcd086 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 09:06:37 +0100 Subject: [PATCH 10/10] final package versions --- packages/package_info_plus/pubspec.yaml | 12 ++++-------- packages/package_info_plus_web/pubspec.yaml | 3 +-- packages/package_info_plus_windows/pubspec.yaml | 3 +-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/packages/package_info_plus/pubspec.yaml b/packages/package_info_plus/pubspec.yaml index c7fcf20e6c..c337a6655f 100644 --- a/packages/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/pubspec.yaml @@ -22,14 +22,10 @@ flutter: dependencies: flutter: sdk: flutter - package_info_plus_platform_interface: - path: ../package_info_plus_platform_interface - package_info_plus_web: - path: ../package_info_plus_web - package_info_plus_macos: - path: ../package_info_plus_macos - package_info_plus_windows: - path: ../package_info_plus_windows + package_info_plus_platform_interface: ^0.3.0 + package_info_plus_web: ^0.1.0 + package_info_plus_macos: ^0.2.0 + package_info_plus_windows: ^0.1.0 dev_dependencies: flutter_test: diff --git a/packages/package_info_plus_web/pubspec.yaml b/packages/package_info_plus_web/pubspec.yaml index f2d9c12f7d..ffbe3ba270 100644 --- a/packages/package_info_plus_web/pubspec.yaml +++ b/packages/package_info_plus_web/pubspec.yaml @@ -13,8 +13,7 @@ flutter: dependencies: http: ^0.12.0 - package_info_plus_platform_interface: - path: ../package_info_plus_platform_interface + package_info_plus_platform_interface: ^0.1.0 platform_detect: ^1.4.0 flutter: sdk: flutter diff --git a/packages/package_info_plus_windows/pubspec.yaml b/packages/package_info_plus_windows/pubspec.yaml index 9364bad7bc..ffadd64868 100644 --- a/packages/package_info_plus_windows/pubspec.yaml +++ b/packages/package_info_plus_windows/pubspec.yaml @@ -9,8 +9,7 @@ environment: flutter: ">=1.17.0 <2.0.0" dependencies: - package_info_plus_platform_interface: - path: ../package_info_plus_platform_interface + package_info_plus_platform_interface: ^0.1.0 ffi: ^0.1.3 flutter: sdk: flutter