diff --git a/packages/device_info_plus/android/build.gradle b/packages/device_info_plus/android/build.gradle index 58bdfd3276..30e1fccbf3 100644 --- a/packages/device_info_plus/android/build.gradle +++ b/packages/device_info_plus/android/build.gradle @@ -1,4 +1,4 @@ -group 'io.flutter.plugins.deviceinfo' +group 'dev.fluttercommunity.plus.device_info' version '1.0-SNAPSHOT' buildscript { diff --git a/packages/device_info_plus/android/src/main/AndroidManifest.xml b/packages/device_info_plus/android/src/main/AndroidManifest.xml index 03e7688326..9a513275a6 100644 --- a/packages/device_info_plus/android/src/main/AndroidManifest.xml +++ b/packages/device_info_plus/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="dev.fluttercommunity.plus.device_info"> diff --git a/packages/device_info_plus/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java b/packages/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java similarity index 81% rename from packages/device_info_plus/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java rename to packages/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java index 8061959c20..ec5cb6e958 100644 --- a/packages/device_info_plus/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java +++ b/packages/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package io.flutter.plugins.deviceinfo; +package dev.fluttercommunity.plus.device_info; import android.content.Context; import io.flutter.embedding.engine.plugins.FlutterPlugin; @@ -10,14 +10,14 @@ import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.PluginRegistry.Registrar; -/** DeviceInfoPlugin */ -public class DeviceInfoPlugin implements FlutterPlugin { +/** DeviceInfoPlusPlugin */ +public class DeviceInfoPlusPlugin implements FlutterPlugin { MethodChannel channel; /** Plugin registration. */ public static void registerWith(Registrar registrar) { - DeviceInfoPlugin plugin = new DeviceInfoPlugin(); + DeviceInfoPlusPlugin plugin = new DeviceInfoPlusPlugin(); plugin.setupMethodChannel(registrar.messenger(), registrar.context()); } @@ -32,7 +32,7 @@ public void onDetachedFromEngine(FlutterPlugin.FlutterPluginBinding binding) { } private void setupMethodChannel(BinaryMessenger messenger, Context context) { - channel = new MethodChannel(messenger, "plugins.flutter.io/device_info"); + channel = new MethodChannel(messenger, "dev.fluttercommunity.plus/device_info"); final MethodCallHandlerImpl handler = new MethodCallHandlerImpl(context.getContentResolver(), context.getPackageManager()); channel.setMethodCallHandler(handler); diff --git a/packages/device_info_plus/android/src/main/java/io/flutter/plugins/deviceinfo/MethodCallHandlerImpl.java b/packages/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.java similarity index 99% rename from packages/device_info_plus/android/src/main/java/io/flutter/plugins/deviceinfo/MethodCallHandlerImpl.java rename to packages/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.java index 800ca6dcdd..d00bc10fcf 100644 --- a/packages/device_info_plus/android/src/main/java/io/flutter/plugins/deviceinfo/MethodCallHandlerImpl.java +++ b/packages/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package io.flutter.plugins.deviceinfo; +package dev.fluttercommunity.plus.device_info; import android.annotation.SuppressLint; import android.content.ContentResolver; diff --git a/packages/device_info_plus/example/pubspec.yaml b/packages/device_info_plus/example/pubspec.yaml index ced252c1c2..e0cdaa0bb4 100644 --- a/packages/device_info_plus/example/pubspec.yaml +++ b/packages/device_info_plus/example/pubspec.yaml @@ -15,3 +15,6 @@ dev_dependencies: flutter: uses-material-design: true + +environment: + sdk: '>=2.10.0 <3.0.0' diff --git a/packages/device_info_plus/ios/Classes/FLTDeviceInfoPlugin.h b/packages/device_info_plus/ios/Classes/FLTDeviceInfoPlusPlugin.h similarity index 76% rename from packages/device_info_plus/ios/Classes/FLTDeviceInfoPlugin.h rename to packages/device_info_plus/ios/Classes/FLTDeviceInfoPlusPlugin.h index b5e95ed10e..7f6c069818 100644 --- a/packages/device_info_plus/ios/Classes/FLTDeviceInfoPlugin.h +++ b/packages/device_info_plus/ios/Classes/FLTDeviceInfoPlusPlugin.h @@ -4,5 +4,5 @@ #import -@interface FLTDeviceInfoPlugin : NSObject +@interface FLTDeviceInfoPlusPlugin : NSObject @end diff --git a/packages/device_info_plus/ios/Classes/FLTDeviceInfoPlugin.m b/packages/device_info_plus/ios/Classes/FLTDeviceInfoPlusPlugin.m similarity index 86% rename from packages/device_info_plus/ios/Classes/FLTDeviceInfoPlugin.m rename to packages/device_info_plus/ios/Classes/FLTDeviceInfoPlusPlugin.m index 423896061a..81eedd1ec2 100644 --- a/packages/device_info_plus/ios/Classes/FLTDeviceInfoPlugin.m +++ b/packages/device_info_plus/ios/Classes/FLTDeviceInfoPlusPlugin.m @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTDeviceInfoPlugin.h" +#import "FLTDeviceInfoPlusPlugin.h" #import -@implementation FLTDeviceInfoPlugin +@implementation FLTDeviceInfoPlusPlugin + (void)registerWithRegistrar:(NSObject*)registrar { FlutterMethodChannel* channel = - [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/device_info" + [FlutterMethodChannel methodChannelWithName:@"dev.fluttercommunity.plus/device_info" binaryMessenger:[registrar messenger]]; - FLTDeviceInfoPlugin* instance = [[FLTDeviceInfoPlugin alloc] init]; + FLTDeviceInfoPlusPlugin* instance = [[FLTDeviceInfoPlusPlugin alloc] init]; [registrar addMethodCallDelegate:instance channel:channel]; } diff --git a/packages/device_info_plus/pubspec.yaml b/packages/device_info_plus/pubspec.yaml index 42859c029f..e87276615c 100644 --- a/packages/device_info_plus/pubspec.yaml +++ b/packages/device_info_plus/pubspec.yaml @@ -9,10 +9,10 @@ flutter: plugin: platforms: android: - package: io.flutter.plugins.deviceinfo - pluginClass: DeviceInfoPlugin + package: dev.fluttercommunity.plus.device_info + pluginClass: DeviceInfoPlusPlugin ios: - pluginClass: FLTDeviceInfoPlugin + pluginClass: FLTDeviceInfoPlusPlugin linux: default_package: device_info_plus_linux web: diff --git a/packages/device_info_plus_linux/CHANGELOG.md b/packages/device_info_plus_linux/CHANGELOG.md index bc89d498e4..b7e6710c52 100644 --- a/packages/device_info_plus_linux/CHANGELOG.md +++ b/packages/device_info_plus_linux/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.0 + +- Rename method channel to avoid conflicts. + ## 0.1.0 - Intial release and transfer to plus-plugins monorepo diff --git a/packages/device_info_plus_linux/pubspec.yaml b/packages/device_info_plus_linux/pubspec.yaml index a3ec9ac9b5..4186bf0255 100644 --- a/packages/device_info_plus_linux/pubspec.yaml +++ b/packages/device_info_plus_linux/pubspec.yaml @@ -1,6 +1,6 @@ name: device_info_plus_linux description: Linux implementation of the device_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/ @@ -9,7 +9,7 @@ environment: flutter: ">=1.17.0 <2.0.0" dependencies: - device_info_plus_platform_interface: ^0.2.0 + device_info_plus_platform_interface: ^0.3.0 file: '>=5.2.1 <=6.0.0' flutter: sdk: flutter diff --git a/packages/device_info_plus_platform_interface/CHANGELOG.md b/packages/device_info_plus_platform_interface/CHANGELOG.md index 7b5e032337..ec4dd4b340 100644 --- a/packages/device_info_plus_platform_interface/CHANGELOG.md +++ b/packages/device_info_plus_platform_interface/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.0 + +- Rename method channel to avoid conflicts. + ## 0.2.0 - Transfer to plus-plugins monorepo diff --git a/packages/device_info_plus_platform_interface/lib/method_channel/method_channel_device_info.dart b/packages/device_info_plus_platform_interface/lib/method_channel/method_channel_device_info.dart index 9907b32f0e..91d3a9e14a 100644 --- a/packages/device_info_plus_platform_interface/lib/method_channel/method_channel_device_info.dart +++ b/packages/device_info_plus_platform_interface/lib/method_channel/method_channel_device_info.dart @@ -9,7 +9,8 @@ import 'package:device_info_plus_platform_interface/device_info_plus_platform_in class MethodChannelDeviceInfo extends DeviceInfoPlatform { /// The method channel used to interact with the native platform. @visibleForTesting - MethodChannel channel = MethodChannel('plugins.flutter.io/device_info'); + MethodChannel channel = + MethodChannel('dev.fluttercommunity.plus/device_info'); // Method channel for Android devices Future androidInfo() async { diff --git a/packages/device_info_plus_platform_interface/pubspec.yaml b/packages/device_info_plus_platform_interface/pubspec.yaml index 54606b09de..f85738ed6f 100644 --- a/packages/device_info_plus_platform_interface/pubspec.yaml +++ b/packages/device_info_plus_platform_interface/pubspec.yaml @@ -1,6 +1,6 @@ name: device_info_plus_platform_interface description: A common platform interface for the device_info_plis plugin. -version: 0.2.0 +version: 0.3.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/device_info_plus_web/CHANGELOG.md b/packages/device_info_plus_web/CHANGELOG.md index 2a6935bd47..c0f7fa71bd 100644 --- a/packages/device_info_plus_web/CHANGELOG.md +++ b/packages/device_info_plus_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.0 + +- Rename method channel to avoid conflicts. + ## 0.2.0 - Transfer to plus-plugins monorepo diff --git a/packages/device_info_plus_web/lib/device_info_plus_web.dart b/packages/device_info_plus_web/lib/device_info_plus_web.dart index 77fa2cb306..b78ec35730 100644 --- a/packages/device_info_plus_web/lib/device_info_plus_web.dart +++ b/packages/device_info_plus_web/lib/device_info_plus_web.dart @@ -5,16 +5,16 @@ import 'package:device_info_plus_platform_interface/device_info_plus_platform_in import 'package:flutter_web_plugins/flutter_web_plugins.dart'; /// The web implementation of the BatteryPlusPlatform of the BatteryPlus plugin. -class DeviceInfoPlugin extends DeviceInfoPlatform { - /// Constructs a DeviceInfoPlugin. - DeviceInfoPlugin(navigator) : _navigator = navigator; +class DeviceInfoPlusPlugin extends DeviceInfoPlatform { + /// Constructs a DeviceInfoPlusPlugin. + DeviceInfoPlusPlugin(navigator) : _navigator = navigator; final html.Navigator _navigator; /// Factory method that initializes the DeviceInfoPlus plugin platform /// with an instance of the plugin for the web. static void registerWith(Registrar registrar) { - DeviceInfoPlatform.instance = DeviceInfoPlugin(html.window.navigator); + DeviceInfoPlatform.instance = DeviceInfoPlusPlugin(html.window.navigator); } @override diff --git a/packages/device_info_plus_web/pubspec.yaml b/packages/device_info_plus_web/pubspec.yaml index 5b3422c196..dfb34b542e 100644 --- a/packages/device_info_plus_web/pubspec.yaml +++ b/packages/device_info_plus_web/pubspec.yaml @@ -1,6 +1,6 @@ name: device_info_plus_web description: An implementation for the web platform of the Flutter `device_info_plus` plugin. -version: 0.2.0 +version: 0.3.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -8,11 +8,11 @@ flutter: plugin: platforms: web: - pluginClass: DeviceInfoPlugin + pluginClass: DeviceInfoPlusPlugin fileName: device_info_plus_web.dart dependencies: - device_info_plus_platform_interface: ^0.2.0 + device_info_plus_platform_interface: ^0.3.0 flutter_web_plugins: sdk: flutter flutter: