From 16d872becc9c6b0b78565822698da4a6735d39bf Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Sat, 12 Dec 2020 18:06:07 +0100 Subject: [PATCH 1/7] [sensors_plus] renamed method channel --- .../main/java/io/flutter/plugins/sensors/SensorsPlugin.java | 6 +++--- packages/sensors_plus/ios/Classes/FLTSensorsPlugin.m | 6 +++--- packages/sensors_plus/test/sensors_test.dart | 6 +++--- .../lib/src/method_channel_sensors.dart | 6 +++--- .../test/sensors_plus_platform_interface_test.dart | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/sensors_plus/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java b/packages/sensors_plus/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java index 5c9cad2dd6..1465f208bd 100644 --- a/packages/sensors_plus/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java +++ b/packages/sensors_plus/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java @@ -15,10 +15,10 @@ /** SensorsPlugin */ public class SensorsPlugin implements FlutterPlugin { private static final String ACCELEROMETER_CHANNEL_NAME = - "plugins.flutter.io/sensors/accelerometer"; - private static final String GYROSCOPE_CHANNEL_NAME = "plugins.flutter.io/sensors/gyroscope"; + "dev.fluttercommunity.plus/sensors/accelerometer"; + private static final String GYROSCOPE_CHANNEL_NAME = "dev.fluttercommunity.plus/sensors/gyroscope"; private static final String USER_ACCELEROMETER_CHANNEL_NAME = - "plugins.flutter.io/sensors/user_accel"; + "dev.fluttercommunity.plus/sensors/user_accel"; private EventChannel accelerometerChannel; private EventChannel userAccelChannel; diff --git a/packages/sensors_plus/ios/Classes/FLTSensorsPlugin.m b/packages/sensors_plus/ios/Classes/FLTSensorsPlugin.m index ba8d542f48..0b10dcfbf0 100644 --- a/packages/sensors_plus/ios/Classes/FLTSensorsPlugin.m +++ b/packages/sensors_plus/ios/Classes/FLTSensorsPlugin.m @@ -11,20 +11,20 @@ + (void)registerWithRegistrar:(NSObject*)registrar { FLTAccelerometerStreamHandler* accelerometerStreamHandler = [[FLTAccelerometerStreamHandler alloc] init]; FlutterEventChannel* accelerometerChannel = - [FlutterEventChannel eventChannelWithName:@"plugins.flutter.io/sensors/accelerometer" + [FlutterEventChannel eventChannelWithName:@"dev.fluttercommunity.plus/sensors/accelerometer" binaryMessenger:[registrar messenger]]; [accelerometerChannel setStreamHandler:accelerometerStreamHandler]; FLTUserAccelStreamHandler* userAccelerometerStreamHandler = [[FLTUserAccelStreamHandler alloc] init]; FlutterEventChannel* userAccelerometerChannel = - [FlutterEventChannel eventChannelWithName:@"plugins.flutter.io/sensors/user_accel" + [FlutterEventChannel eventChannelWithName:@"dev.fluttercommunity.plus/sensors/user_accel" binaryMessenger:[registrar messenger]]; [userAccelerometerChannel setStreamHandler:userAccelerometerStreamHandler]; FLTGyroscopeStreamHandler* gyroscopeStreamHandler = [[FLTGyroscopeStreamHandler alloc] init]; FlutterEventChannel* gyroscopeChannel = - [FlutterEventChannel eventChannelWithName:@"plugins.flutter.io/sensors/gyroscope" + [FlutterEventChannel eventChannelWithName:@"dev.fluttercommunity.plus/sensors/gyroscope" binaryMessenger:[registrar messenger]]; [gyroscopeChannel setStreamHandler:gyroscopeStreamHandler]; } diff --git a/packages/sensors_plus/test/sensors_test.dart b/packages/sensors_plus/test/sensors_test.dart index 29744a90b8..9ddb096d8c 100644 --- a/packages/sensors_plus/test/sensors_test.dart +++ b/packages/sensors_plus/test/sensors_test.dart @@ -13,7 +13,7 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); test('$accelerometerEvents are streamed', () async { - const String channelName = 'plugins.flutter.io/sensors/accelerometer'; + const String channelName = 'dev.fluttercommunity.plus/sensors/accelerometer'; const List sensorData = [1.0, 2.0, 3.0]; _initializeFakeSensorChannel(channelName, sensorData); @@ -25,7 +25,7 @@ void main() { }); test('$gyroscopeEvents are streamed', () async { - const String channelName = 'plugins.flutter.io/sensors/gyroscope'; + const String channelName = 'dev.fluttercommunity.plus/sensors/gyroscope'; const List sensorData = [3.0, 4.0, 5.0]; _initializeFakeSensorChannel(channelName, sensorData); @@ -37,7 +37,7 @@ void main() { }); test('$userAccelerometerEvents are streamed', () async { - const String channelName = 'plugins.flutter.io/sensors/user_accel'; + const String channelName = 'dev.fluttercommunity.plus/sensors/user_accel'; const List sensorData = [6.0, 7.0, 8.0]; _initializeFakeSensorChannel(channelName, sensorData); diff --git a/packages/sensors_plus_platform_interface/lib/src/method_channel_sensors.dart b/packages/sensors_plus_platform_interface/lib/src/method_channel_sensors.dart index c637162744..3a30405f16 100644 --- a/packages/sensors_plus_platform_interface/lib/src/method_channel_sensors.dart +++ b/packages/sensors_plus_platform_interface/lib/src/method_channel_sensors.dart @@ -10,13 +10,13 @@ import 'package:sensors_plus_platform_interface/sensors_plus_platform_interface. /// A method channel -based implementation of the SensorsPlatform interface. class MethodChannelSensors extends SensorsPlatform { static const EventChannel _accelerometerEventChannel = - EventChannel('plugins.flutter.io/sensors/accelerometer'); + EventChannel('dev.fluttercommunity.plus/sensors/accelerometer'); static const EventChannel _userAccelerometerEventChannel = - EventChannel('plugins.flutter.io/sensors/user_accel'); + EventChannel('dev.fluttercommunity.plus/sensors/user_accel'); static const EventChannel _gyroscopeEventChannel = - EventChannel('plugins.flutter.io/sensors/gyroscope'); + EventChannel('dev.fluttercommunity.plus/sensors/gyroscope'); Stream _accelerometerEvents; Stream _gyroscopeEvents; diff --git a/packages/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart b/packages/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart index 6ca8ea4eec..8c9d65b809 100644 --- a/packages/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart +++ b/packages/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart @@ -31,7 +31,7 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); test('$accelerometerEvents are streamed', () async { - const String channelName = 'plugins.flutter.io/sensors/accelerometer'; + const String channelName = 'dev.fluttercommunity.plus/sensors/accelerometer'; const List sensorData = [1.0, 2.0, 3.0]; _initializeFakeSensorChannel(channelName, sensorData); @@ -43,7 +43,7 @@ void main() { }); test('$gyroscopeEvents are streamed', () async { - const String channelName = 'plugins.flutter.io/sensors/gyroscope'; + const String channelName = 'dev.fluttercommunity.plus/sensors/gyroscope'; const List sensorData = [3.0, 4.0, 5.0]; _initializeFakeSensorChannel(channelName, sensorData); @@ -55,7 +55,7 @@ void main() { }); test('$userAccelerometerEvents are streamed', () async { - const String channelName = 'plugins.flutter.io/sensors/user_accel'; + const String channelName = 'dev.fluttercommunity.plus/sensors/user_accel'; const List sensorData = [6.0, 7.0, 8.0]; _initializeFakeSensorChannel(channelName, sensorData); From 03f4e9e001b3e2b37e9fe61c778d391da836942b Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Sat, 12 Dec 2020 18:16:48 +0100 Subject: [PATCH 2/7] [sensors_plus] android rename --- .../sensors_plus/android/src/main/AndroidManifest.xml | 2 +- .../fluttercommunity/plus}/sensors/SensorsPlugin.java | 2 +- .../fluttercommunity/plus}/sensors/StreamHandlerImpl.java | 2 +- .../plugins/sensorsexample/EmbeddingV1Activity.java | 4 ++-- packages/sensors_plus/pubspec.yaml | 8 +++++--- packages/sensors_plus_web/pubspec.yaml | 3 ++- 6 files changed, 12 insertions(+), 9 deletions(-) rename packages/sensors_plus/android/src/main/java/{io/flutter/plugins => dev/fluttercommunity/plus}/sensors/SensorsPlugin.java (98%) rename packages/sensors_plus/android/src/main/java/{io/flutter/plugins => dev/fluttercommunity/plus}/sensors/StreamHandlerImpl.java (97%) diff --git a/packages/sensors_plus/android/src/main/AndroidManifest.xml b/packages/sensors_plus/android/src/main/AndroidManifest.xml index 44d0c9993c..7ce25a5146 100644 --- a/packages/sensors_plus/android/src/main/AndroidManifest.xml +++ b/packages/sensors_plus/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="dev.fluttercommunity.plus.sensors"> diff --git a/packages/sensors_plus/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java b/packages/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/SensorsPlugin.java similarity index 98% rename from packages/sensors_plus/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java rename to packages/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/SensorsPlugin.java index 1465f208bd..93fcbc1b77 100644 --- a/packages/sensors_plus/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java +++ b/packages/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/SensorsPlugin.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.sensors; +package dev.fluttercommunity.plus.sensors; import android.content.Context; import android.hardware.Sensor; diff --git a/packages/sensors_plus/android/src/main/java/io/flutter/plugins/sensors/StreamHandlerImpl.java b/packages/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/StreamHandlerImpl.java similarity index 97% rename from packages/sensors_plus/android/src/main/java/io/flutter/plugins/sensors/StreamHandlerImpl.java rename to packages/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/StreamHandlerImpl.java index ac0546109f..36a6d6017b 100644 --- a/packages/sensors_plus/android/src/main/java/io/flutter/plugins/sensors/StreamHandlerImpl.java +++ b/packages/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/StreamHandlerImpl.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.sensors; +package dev.fluttercommunity.plus.sensors; import android.hardware.Sensor; import android.hardware.SensorEvent; diff --git a/packages/sensors_plus/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java b/packages/sensors_plus/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java index 390819ba0e..53c4cce62f 100644 --- a/packages/sensors_plus/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java +++ b/packages/sensors_plus/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java @@ -6,8 +6,8 @@ import android.os.Bundle; import dev.flutter.plugins.integration_test.IntegrationTestPlugin; +import dev.fluttercommunity.plus.sensors.SensorsPlugin; import io.flutter.app.FlutterActivity; -import io.flutter.plugins.sensors.SensorsPlugin; public class EmbeddingV1Activity extends FlutterActivity { @Override @@ -15,6 +15,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); - SensorsPlugin.registerWith(registrarFor("io.flutter.plugins.sensors.SensorsPlugin")); + SensorsPlugin.registerWith(registrarFor("dev.fluttercommunty.plus.sensors.SensorsPlugin")); } } diff --git a/packages/sensors_plus/pubspec.yaml b/packages/sensors_plus/pubspec.yaml index a77fba7e16..246b9e47d2 100644 --- a/packages/sensors_plus/pubspec.yaml +++ b/packages/sensors_plus/pubspec.yaml @@ -8,7 +8,7 @@ flutter: plugin: platforms: android: - package: io.flutter.plugins.sensors + package: dev.fluttercommunity.plus.sensors pluginClass: SensorsPlugin ios: pluginClass: FLTSensorsPlugin @@ -18,8 +18,10 @@ flutter: dependencies: flutter: sdk: flutter - sensors_plus_web: ^0.1.0 - sensors_plus_platform_interface: ^0.1.0 + sensors_plus_web: + path: ../sensors_plus_web + sensors_plus_platform_interface: + path: ../sensors_plus_platform_interface dev_dependencies: test: ^1.3.0 diff --git a/packages/sensors_plus_web/pubspec.yaml b/packages/sensors_plus_web/pubspec.yaml index f770c9424d..fd65da8e0c 100644 --- a/packages/sensors_plus_web/pubspec.yaml +++ b/packages/sensors_plus_web/pubspec.yaml @@ -18,7 +18,8 @@ flutter: dependencies: flutter: sdk: flutter - sensors_plus_platform_interface: ^0.1.0 + sensors_plus_platform_interface: + path: ../sensors_plus_platform_interface flutter_web_plugins: sdk: flutter From 6e50ba06dac6a41c1d8b9d602ecf374f49d498cf Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Sat, 12 Dec 2020 18:19:34 +0100 Subject: [PATCH 3/7] [sensors_plus] iOS rename --- .../example/ios/Flutter/.last_build_id | 1 + .../example/ios/Flutter/Flutter.podspec | 18 +++++++++++++++++ .../ios/Runner.xcodeproj/project.pbxproj | 19 ++++-------------- .../ios/Classes/FLTSensorsPlugin.h | 17 ---------------- .../ios/Classes/FLTSensorsPlusPlugin.h | 17 ++++++++++++++++ ...SensorsPlugin.m => FLTSensorsPlusPlugin.m} | 20 +++++++++---------- packages/sensors_plus/pubspec.yaml | 2 +- 7 files changed, 51 insertions(+), 43 deletions(-) create mode 100644 packages/sensors_plus/example/ios/Flutter/.last_build_id create mode 100644 packages/sensors_plus/example/ios/Flutter/Flutter.podspec delete mode 100644 packages/sensors_plus/ios/Classes/FLTSensorsPlugin.h create mode 100644 packages/sensors_plus/ios/Classes/FLTSensorsPlusPlugin.h rename packages/sensors_plus/ios/Classes/{FLTSensorsPlugin.m => FLTSensorsPlusPlugin.m} (87%) diff --git a/packages/sensors_plus/example/ios/Flutter/.last_build_id b/packages/sensors_plus/example/ios/Flutter/.last_build_id new file mode 100644 index 0000000000..13b0a7b1e4 --- /dev/null +++ b/packages/sensors_plus/example/ios/Flutter/.last_build_id @@ -0,0 +1 @@ +22217502d78c84badc56f9a54d0bdd3c \ No newline at end of file diff --git a/packages/sensors_plus/example/ios/Flutter/Flutter.podspec b/packages/sensors_plus/example/ios/Flutter/Flutter.podspec new file mode 100644 index 0000000000..5ca30416ba --- /dev/null +++ b/packages/sensors_plus/example/ios/Flutter/Flutter.podspec @@ -0,0 +1,18 @@ +# +# NOTE: This podspec is NOT to be published. It is only used as a local source! +# + +Pod::Spec.new do |s| + s.name = 'Flutter' + s.version = '1.0.0' + s.summary = 'High-performance, high-fidelity mobile apps.' + s.description = <<-DESC +Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS. + DESC + s.homepage = 'https://flutter.io' + s.license = { :type => 'MIT' } + s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } + s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } + s.ios.deployment_target = '8.0' + s.vendored_frameworks = 'Flutter.framework' +end diff --git a/packages/sensors_plus/example/ios/Runner.xcodeproj/project.pbxproj b/packages/sensors_plus/example/ios/Runner.xcodeproj/project.pbxproj index 8bde68c847..2ee5791784 100644 --- a/packages/sensors_plus/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/sensors_plus/example/ios/Runner.xcodeproj/project.pbxproj @@ -9,10 +9,6 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; @@ -28,8 +24,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -40,7 +34,6 @@ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; 518BFCF6A33590E963FE1FA9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 65D7779632A59CFED1723B85 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -48,7 +41,6 @@ 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; - 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; @@ -63,8 +55,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, A5B646543530B300A487D9B1 /* libPods-Runner.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -84,9 +74,7 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( - 3B80C3931E831B6300D905FE /* App.framework */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEBA1CF902C7004384FC /* Flutter.framework */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, 9740EEB31CF90195004384FC /* Generated.xcconfig */, @@ -223,9 +211,12 @@ files = ( ); inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${PODS_ROOT}/../Flutter/Flutter.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -244,7 +235,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; 7B77DB2BA78582CC43C8E79F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; @@ -315,7 +306,6 @@ /* Begin XCBuildConfiguration section */ 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; @@ -372,7 +362,6 @@ }; 97C147041CF9000F007C117D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; diff --git a/packages/sensors_plus/ios/Classes/FLTSensorsPlugin.h b/packages/sensors_plus/ios/Classes/FLTSensorsPlugin.h deleted file mode 100644 index 288db1901e..0000000000 --- a/packages/sensors_plus/ios/Classes/FLTSensorsPlugin.h +++ /dev/null @@ -1,17 +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. - -#import - -@interface FLTSensorsPlugin : NSObject -@end - -@interface FLTUserAccelStreamHandler : NSObject -@end - -@interface FLTAccelerometerStreamHandler : NSObject -@end - -@interface FLTGyroscopeStreamHandler : NSObject -@end diff --git a/packages/sensors_plus/ios/Classes/FLTSensorsPlusPlugin.h b/packages/sensors_plus/ios/Classes/FLTSensorsPlusPlugin.h new file mode 100644 index 0000000000..1cc3fa3ee0 --- /dev/null +++ b/packages/sensors_plus/ios/Classes/FLTSensorsPlusPlugin.h @@ -0,0 +1,17 @@ +// 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. + +#import + +@interface FLTSensorsPlusPlugin : NSObject +@end + +@interface FLTUserAccelStreamHandlerPlus : NSObject +@end + +@interface FLTAccelerometerStreamHandlerPlus : NSObject +@end + +@interface FLTGyroscopeStreamHandlerPlus : NSObject +@end diff --git a/packages/sensors_plus/ios/Classes/FLTSensorsPlugin.m b/packages/sensors_plus/ios/Classes/FLTSensorsPlusPlugin.m similarity index 87% rename from packages/sensors_plus/ios/Classes/FLTSensorsPlugin.m rename to packages/sensors_plus/ios/Classes/FLTSensorsPlusPlugin.m index 0b10dcfbf0..427843cdf8 100644 --- a/packages/sensors_plus/ios/Classes/FLTSensorsPlugin.m +++ b/packages/sensors_plus/ios/Classes/FLTSensorsPlusPlugin.m @@ -2,27 +2,27 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTSensorsPlugin.h" +#import "FLTSensorsPlusPlugin.h" #import -@implementation FLTSensorsPlugin +@implementation FLTSensorsPlusPlugin + (void)registerWithRegistrar:(NSObject*)registrar { - FLTAccelerometerStreamHandler* accelerometerStreamHandler = - [[FLTAccelerometerStreamHandler alloc] init]; + FLTAccelerometerStreamHandlerPlus* accelerometerStreamHandler = + [[FLTAccelerometerStreamHandlerPlus alloc] init]; FlutterEventChannel* accelerometerChannel = [FlutterEventChannel eventChannelWithName:@"dev.fluttercommunity.plus/sensors/accelerometer" binaryMessenger:[registrar messenger]]; [accelerometerChannel setStreamHandler:accelerometerStreamHandler]; - FLTUserAccelStreamHandler* userAccelerometerStreamHandler = - [[FLTUserAccelStreamHandler alloc] init]; + FLTUserAccelStreamHandlerPlus* userAccelerometerStreamHandler = + [[FLTUserAccelStreamHandlerPlus alloc] init]; FlutterEventChannel* userAccelerometerChannel = [FlutterEventChannel eventChannelWithName:@"dev.fluttercommunity.plus/sensors/user_accel" binaryMessenger:[registrar messenger]]; [userAccelerometerChannel setStreamHandler:userAccelerometerStreamHandler]; - FLTGyroscopeStreamHandler* gyroscopeStreamHandler = [[FLTGyroscopeStreamHandler alloc] init]; + FLTGyroscopeStreamHandlerPlus* gyroscopeStreamHandler = [[FLTGyroscopeStreamHandlerPlus alloc] init]; FlutterEventChannel* gyroscopeChannel = [FlutterEventChannel eventChannelWithName:@"dev.fluttercommunity.plus/sensors/gyroscope" binaryMessenger:[registrar messenger]]; @@ -48,7 +48,7 @@ static void sendTriplet(Float64 x, Float64 y, Float64 z, FlutterEventSink sink) sink([FlutterStandardTypedData typedDataWithFloat64:event]); } -@implementation FLTAccelerometerStreamHandler +@implementation FLTAccelerometerStreamHandlerPlus - (FlutterError*)onListenWithArguments:(id)arguments eventSink:(FlutterEventSink)eventSink { _initMotionManager(); @@ -71,7 +71,7 @@ - (FlutterError*)onCancelWithArguments:(id)arguments { @end -@implementation FLTUserAccelStreamHandler +@implementation FLTUserAccelStreamHandlerPlus - (FlutterError*)onListenWithArguments:(id)arguments eventSink:(FlutterEventSink)eventSink { _initMotionManager(); @@ -93,7 +93,7 @@ - (FlutterError*)onCancelWithArguments:(id)arguments { @end -@implementation FLTGyroscopeStreamHandler +@implementation FLTGyroscopeStreamHandlerPlus - (FlutterError*)onListenWithArguments:(id)arguments eventSink:(FlutterEventSink)eventSink { _initMotionManager(); diff --git a/packages/sensors_plus/pubspec.yaml b/packages/sensors_plus/pubspec.yaml index 246b9e47d2..e08b55b14f 100644 --- a/packages/sensors_plus/pubspec.yaml +++ b/packages/sensors_plus/pubspec.yaml @@ -11,7 +11,7 @@ flutter: package: dev.fluttercommunity.plus.sensors pluginClass: SensorsPlugin ios: - pluginClass: FLTSensorsPlugin + pluginClass: FLTSensorsPlusPlugin web: default_package: sensors_plus_web From 2a7b9ba322040b43ab8a9b530e1a8502a1c50354 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Sat, 12 Dec 2020 18:26:56 +0100 Subject: [PATCH 4/7] [sensors_plus] packages and changelogs for release --- packages/sensors_plus/CHANGELOG.md | 4 ++++ packages/sensors_plus/pubspec.yaml | 8 +++----- packages/sensors_plus_platform_interface/CHANGELOG.md | 4 ++++ packages/sensors_plus_platform_interface/pubspec.yaml | 2 +- packages/sensors_plus_web/CHANGELOG.md | 4 ++++ packages/sensors_plus_web/pubspec.yaml | 5 ++--- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/packages/sensors_plus/CHANGELOG.md b/packages/sensors_plus/CHANGELOG.md index 5597b4a53a..c3346b992e 100644 --- a/packages/sensors_plus/CHANGELOG.md +++ b/packages/sensors_plus/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.0 + +- Renamed Method Channel + ## 0.5.0 - Transfer to plus-plugins monorepo diff --git a/packages/sensors_plus/pubspec.yaml b/packages/sensors_plus/pubspec.yaml index e08b55b14f..bc665cb4cb 100644 --- a/packages/sensors_plus/pubspec.yaml +++ b/packages/sensors_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: sensors_plus description: Flutter plugin for accessing accelerometer and gyroscope sensors. -version: 0.5.0 +version: 0.6.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -18,10 +18,8 @@ flutter: dependencies: flutter: sdk: flutter - sensors_plus_web: - path: ../sensors_plus_web - sensors_plus_platform_interface: - path: ../sensors_plus_platform_interface + sensors_plus_web: ^0.2.0 + sensors_plus_platform_interface: ^0.2.0 dev_dependencies: test: ^1.3.0 diff --git a/packages/sensors_plus_platform_interface/CHANGELOG.md b/packages/sensors_plus_platform_interface/CHANGELOG.md index 3fae439fd6..fb8fd27d88 100644 --- a/packages/sensors_plus_platform_interface/CHANGELOG.md +++ b/packages/sensors_plus_platform_interface/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.0 + +- Renamed Method Channel + ## 0.1.0 - Transfer to plus-plugins monorepo diff --git a/packages/sensors_plus_platform_interface/pubspec.yaml b/packages/sensors_plus_platform_interface/pubspec.yaml index 4049ae78f2..e1530b136a 100644 --- a/packages/sensors_plus_platform_interface/pubspec.yaml +++ b/packages/sensors_plus_platform_interface/pubspec.yaml @@ -1,6 +1,6 @@ name: sensors_plus_platform_interface description: A common platform interface for the sensors_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/sensors_plus_web/CHANGELOG.md b/packages/sensors_plus_web/CHANGELOG.md index 3fae439fd6..fb8fd27d88 100644 --- a/packages/sensors_plus_web/CHANGELOG.md +++ b/packages/sensors_plus_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.0 + +- Renamed Method Channel + ## 0.1.0 - Transfer to plus-plugins monorepo diff --git a/packages/sensors_plus_web/pubspec.yaml b/packages/sensors_plus_web/pubspec.yaml index fd65da8e0c..aa9f88bf00 100644 --- a/packages/sensors_plus_web/pubspec.yaml +++ b/packages/sensors_plus_web/pubspec.yaml @@ -1,6 +1,6 @@ name: sensors_plus_web description: The web implementation of sensors_plus -version: 0.1.0 +version: 0.2.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -18,8 +18,7 @@ flutter: dependencies: flutter: sdk: flutter - sensors_plus_platform_interface: - path: ../sensors_plus_platform_interface + sensors_plus_platform_interface: ^0.2.0 flutter_web_plugins: sdk: flutter From 5549b68766cf7aeefa86c9ebc7f2d92e43193e8e Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Sat, 12 Dec 2020 18:33:58 +0100 Subject: [PATCH 5/7] awful java format --- .../java/dev/fluttercommunity/plus/sensors/SensorsPlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/SensorsPlugin.java b/packages/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/SensorsPlugin.java index 93fcbc1b77..e4d7211ddb 100644 --- a/packages/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/SensorsPlugin.java +++ b/packages/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/SensorsPlugin.java @@ -16,7 +16,8 @@ public class SensorsPlugin implements FlutterPlugin { private static final String ACCELEROMETER_CHANNEL_NAME = "dev.fluttercommunity.plus/sensors/accelerometer"; - private static final String GYROSCOPE_CHANNEL_NAME = "dev.fluttercommunity.plus/sensors/gyroscope"; + private static final String GYROSCOPE_CHANNEL_NAME = + "dev.fluttercommunity.plus/sensors/gyroscope"; private static final String USER_ACCELEROMETER_CHANNEL_NAME = "dev.fluttercommunity.plus/sensors/user_accel"; From 605ed5b0b1691ab052b34bff2caea4c74d585687 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Sat, 12 Dec 2020 18:36:37 +0100 Subject: [PATCH 6/7] ios format --- packages/sensors_plus/ios/Classes/FLTSensorsPlusPlugin.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/sensors_plus/ios/Classes/FLTSensorsPlusPlugin.m b/packages/sensors_plus/ios/Classes/FLTSensorsPlusPlugin.m index 427843cdf8..c3c91244bc 100644 --- a/packages/sensors_plus/ios/Classes/FLTSensorsPlusPlugin.m +++ b/packages/sensors_plus/ios/Classes/FLTSensorsPlusPlugin.m @@ -22,7 +22,8 @@ + (void)registerWithRegistrar:(NSObject*)registrar { binaryMessenger:[registrar messenger]]; [userAccelerometerChannel setStreamHandler:userAccelerometerStreamHandler]; - FLTGyroscopeStreamHandlerPlus* gyroscopeStreamHandler = [[FLTGyroscopeStreamHandlerPlus alloc] init]; + FLTGyroscopeStreamHandlerPlus* gyroscopeStreamHandler = + [[FLTGyroscopeStreamHandlerPlus alloc] init]; FlutterEventChannel* gyroscopeChannel = [FlutterEventChannel eventChannelWithName:@"dev.fluttercommunity.plus/sensors/gyroscope" binaryMessenger:[registrar messenger]]; From c8612798f9929455a3a8273127e7ea1ed8a6f498 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Sat, 12 Dec 2020 18:37:22 +0100 Subject: [PATCH 7/7] dart format --- packages/sensors_plus/test/sensors_test.dart | 3 ++- .../test/sensors_plus_platform_interface_test.dart | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/sensors_plus/test/sensors_test.dart b/packages/sensors_plus/test/sensors_test.dart index 9ddb096d8c..40726513c1 100644 --- a/packages/sensors_plus/test/sensors_test.dart +++ b/packages/sensors_plus/test/sensors_test.dart @@ -13,7 +13,8 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); test('$accelerometerEvents are streamed', () async { - const String channelName = 'dev.fluttercommunity.plus/sensors/accelerometer'; + const String channelName = + 'dev.fluttercommunity.plus/sensors/accelerometer'; const List sensorData = [1.0, 2.0, 3.0]; _initializeFakeSensorChannel(channelName, sensorData); diff --git a/packages/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart b/packages/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart index 8c9d65b809..06ce8cf1a8 100644 --- a/packages/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart +++ b/packages/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart @@ -31,7 +31,8 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); test('$accelerometerEvents are streamed', () async { - const String channelName = 'dev.fluttercommunity.plus/sensors/accelerometer'; + const String channelName = + 'dev.fluttercommunity.plus/sensors/accelerometer'; const List sensorData = [1.0, 2.0, 3.0]; _initializeFakeSensorChannel(channelName, sensorData);