From bac73db26216bbe7ccb16778f5076ecfd100baec Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Fri, 24 Dec 2021 16:55:10 +0200 Subject: [PATCH 1/9] [sensors_plus] Migrate Android part to Kotlin --- .../sensors_plus/sensors_plus/CHANGELOG.md | 5 ++ .../sensors_plus/android/build.gradle | 13 +++- .../android/src/main/AndroidManifest.xml | 3 +- .../plus/sensors/SensorsPlugin.java | 78 ------------------- .../plus/sensors/StreamHandlerImpl.java | 50 ------------ .../plus/sensors/SensorsPlugin.kt | 71 +++++++++++++++++ .../plus/sensors/StreamHandlerImpl.kt | 42 ++++++++++ .../sensors_plus/example/android/build.gradle | 2 +- .../example/android/gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.properties | 3 +- .../sensors_plus/sensors_plus/pubspec.yaml | 2 +- 11 files changed, 134 insertions(+), 136 deletions(-) delete mode 100644 packages/sensors_plus/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/SensorsPlugin.java delete mode 100644 packages/sensors_plus/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/StreamHandlerImpl.java create mode 100644 packages/sensors_plus/sensors_plus/android/src/main/kotlin/dev/fluttercommunity/plus/sensors/SensorsPlugin.kt create mode 100644 packages/sensors_plus/sensors_plus/android/src/main/kotlin/dev/fluttercommunity/plus/sensors/StreamHandlerImpl.kt diff --git a/packages/sensors_plus/sensors_plus/CHANGELOG.md b/packages/sensors_plus/sensors_plus/CHANGELOG.md index 7aa1b70487..48bc349c5f 100644 --- a/packages/sensors_plus/sensors_plus/CHANGELOG.md +++ b/packages/sensors_plus/sensors_plus/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.3.0 + +- Android: Migrate to Kotlin +- Android: Update dependencies, build config updates + ## 1.2.1 - Upgrade Android compile SDK version diff --git a/packages/sensors_plus/sensors_plus/android/build.gradle b/packages/sensors_plus/sensors_plus/android/build.gradle index 99f54fe8b3..de3f543a1b 100644 --- a/packages/sensors_plus/sensors_plus/android/build.gradle +++ b/packages/sensors_plus/sensors_plus/android/build.gradle @@ -2,13 +2,15 @@ group 'io.flutter.plugins.sensors' version '1.0-SNAPSHOT' buildscript { + ext.kotlin_version = '1.6.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.0.4' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -20,10 +22,15 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' android { compileSdkVersion 31 + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + defaultConfig { minSdkVersion 16 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -31,4 +38,8 @@ android { lintOptions { disable 'InvalidPackage' } + + dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + } } diff --git a/packages/sensors_plus/sensors_plus/android/src/main/AndroidManifest.xml b/packages/sensors_plus/sensors_plus/android/src/main/AndroidManifest.xml index 8b4504ee4c..36c24719f0 100644 --- a/packages/sensors_plus/sensors_plus/android/src/main/AndroidManifest.xml +++ b/packages/sensors_plus/sensors_plus/android/src/main/AndroidManifest.xml @@ -1,2 +1 @@ - - + diff --git a/packages/sensors_plus/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/SensorsPlugin.java b/packages/sensors_plus/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/SensorsPlugin.java deleted file mode 100644 index 0418741057..0000000000 --- a/packages/sensors_plus/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/SensorsPlugin.java +++ /dev/null @@ -1,78 +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 dev.fluttercommunity.plus.sensors; - -import android.content.Context; -import android.hardware.Sensor; -import android.hardware.SensorManager; -import androidx.annotation.NonNull; -import io.flutter.embedding.engine.plugins.FlutterPlugin; -import io.flutter.plugin.common.BinaryMessenger; -import io.flutter.plugin.common.EventChannel; - -/** SensorsPlugin */ -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 USER_ACCELEROMETER_CHANNEL_NAME = - "dev.fluttercommunity.plus/sensors/user_accel"; - private static final String MAGNETOMETER_CHANNEL_NAME = - "dev.fluttercommunity.plus/sensors/magnetometer"; - - private EventChannel accelerometerChannel; - private EventChannel userAccelChannel; - private EventChannel gyroscopeChannel; - private EventChannel magnetometerChannel; - - @Override - public void onAttachedToEngine(FlutterPluginBinding binding) { - final Context context = binding.getApplicationContext(); - setupEventChannels(context, binding.getBinaryMessenger()); - } - - @Override - public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) { - teardownEventChannels(); - } - - private void setupEventChannels(Context context, BinaryMessenger messenger) { - accelerometerChannel = new EventChannel(messenger, ACCELEROMETER_CHANNEL_NAME); - final StreamHandlerImpl accelerationStreamHandler = - new StreamHandlerImpl( - (SensorManager) context.getSystemService(Context.SENSOR_SERVICE), - Sensor.TYPE_ACCELEROMETER); - accelerometerChannel.setStreamHandler(accelerationStreamHandler); - - userAccelChannel = new EventChannel(messenger, USER_ACCELEROMETER_CHANNEL_NAME); - final StreamHandlerImpl linearAccelerationStreamHandler = - new StreamHandlerImpl( - (SensorManager) context.getSystemService(Context.SENSOR_SERVICE), - Sensor.TYPE_LINEAR_ACCELERATION); - userAccelChannel.setStreamHandler(linearAccelerationStreamHandler); - - gyroscopeChannel = new EventChannel(messenger, GYROSCOPE_CHANNEL_NAME); - final StreamHandlerImpl gyroScopeStreamHandler = - new StreamHandlerImpl( - (SensorManager) context.getSystemService(Context.SENSOR_SERVICE), - Sensor.TYPE_GYROSCOPE); - gyroscopeChannel.setStreamHandler(gyroScopeStreamHandler); - - magnetometerChannel = new EventChannel(messenger, MAGNETOMETER_CHANNEL_NAME); - final StreamHandlerImpl magnetometerStreamHandler = - new StreamHandlerImpl( - (SensorManager) context.getSystemService(Context.SENSOR_SERVICE), - Sensor.TYPE_MAGNETIC_FIELD); - magnetometerChannel.setStreamHandler(magnetometerStreamHandler); - } - - private void teardownEventChannels() { - accelerometerChannel.setStreamHandler(null); - userAccelChannel.setStreamHandler(null); - gyroscopeChannel.setStreamHandler(null); - magnetometerChannel.setStreamHandler(null); - } -} diff --git a/packages/sensors_plus/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/StreamHandlerImpl.java b/packages/sensors_plus/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/StreamHandlerImpl.java deleted file mode 100644 index 6a860ce1da..0000000000 --- a/packages/sensors_plus/sensors_plus/android/src/main/java/dev/fluttercommunity/plus/sensors/StreamHandlerImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2019 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.sensors; - -import android.hardware.Sensor; -import android.hardware.SensorEvent; -import android.hardware.SensorEventListener; -import android.hardware.SensorManager; -import io.flutter.plugin.common.EventChannel; - -class StreamHandlerImpl implements EventChannel.StreamHandler { - - private SensorEventListener sensorEventListener; - private final SensorManager sensorManager; - private final Sensor sensor; - - StreamHandlerImpl(SensorManager sensorManager, int sensorType) { - this.sensorManager = sensorManager; - sensor = sensorManager.getDefaultSensor(sensorType); - } - - @Override - public void onListen(Object arguments, EventChannel.EventSink events) { - sensorEventListener = createSensorEventListener(events); - sensorManager.registerListener(sensorEventListener, sensor, SensorManager.SENSOR_DELAY_NORMAL); - } - - @Override - public void onCancel(Object arguments) { - sensorManager.unregisterListener(sensorEventListener); - } - - SensorEventListener createSensorEventListener(final EventChannel.EventSink events) { - return new SensorEventListener() { - @Override - public void onAccuracyChanged(Sensor sensor, int accuracy) {} - - @Override - public void onSensorChanged(SensorEvent event) { - double[] sensorValues = new double[event.values.length]; - for (int i = 0; i < event.values.length; i++) { - sensorValues[i] = event.values[i]; - } - events.success(sensorValues); - } - }; - } -} diff --git a/packages/sensors_plus/sensors_plus/android/src/main/kotlin/dev/fluttercommunity/plus/sensors/SensorsPlugin.kt b/packages/sensors_plus/sensors_plus/android/src/main/kotlin/dev/fluttercommunity/plus/sensors/SensorsPlugin.kt new file mode 100644 index 0000000000..ed9f7647c0 --- /dev/null +++ b/packages/sensors_plus/sensors_plus/android/src/main/kotlin/dev/fluttercommunity/plus/sensors/SensorsPlugin.kt @@ -0,0 +1,71 @@ +package dev.fluttercommunity.plus.sensors + +import android.content.Context +import android.hardware.Sensor +import android.hardware.SensorManager +import io.flutter.embedding.engine.plugins.FlutterPlugin +import io.flutter.embedding.engine.plugins.FlutterPlugin.FlutterPluginBinding +import io.flutter.plugin.common.BinaryMessenger +import io.flutter.plugin.common.EventChannel + +/** SensorsPlugin */ +class SensorsPlugin : FlutterPlugin { + private lateinit var accelerometerChannel: EventChannel + private lateinit var userAccelChannel: EventChannel + private lateinit var gyroscopeChannel: EventChannel + private lateinit var magnetometerChannel: EventChannel + + override fun onAttachedToEngine(binding: FlutterPluginBinding) { + setupEventChannels(binding.applicationContext, binding.binaryMessenger) + } + + override fun onDetachedFromEngine(binding: FlutterPluginBinding) { + teardownEventChannels() + } + + private fun setupEventChannels(context: Context, messenger: BinaryMessenger) { + val sensorsManager = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager + + accelerometerChannel = EventChannel(messenger, ACCELEROMETER_CHANNEL_NAME) + val accelerationStreamHandler = StreamHandlerImpl( + sensorsManager, + Sensor.TYPE_ACCELEROMETER + ) + accelerometerChannel.setStreamHandler(accelerationStreamHandler) + + userAccelChannel = EventChannel(messenger, USER_ACCELEROMETER_CHANNEL_NAME) + val linearAccelerationStreamHandler = StreamHandlerImpl( + sensorsManager, + Sensor.TYPE_LINEAR_ACCELERATION + ) + userAccelChannel.setStreamHandler(linearAccelerationStreamHandler) + + gyroscopeChannel = EventChannel(messenger, GYROSCOPE_CHANNEL_NAME) + val gyroScopeStreamHandler = StreamHandlerImpl( + sensorsManager, + Sensor.TYPE_GYROSCOPE + ) + gyroscopeChannel.setStreamHandler(gyroScopeStreamHandler) + + magnetometerChannel = EventChannel(messenger, MAGNETOMETER_CHANNEL_NAME) + val magnetometerStreamHandler = StreamHandlerImpl( + sensorsManager, + Sensor.TYPE_MAGNETIC_FIELD + ) + magnetometerChannel.setStreamHandler(magnetometerStreamHandler) + } + + private fun teardownEventChannels() { + accelerometerChannel.setStreamHandler(null) + userAccelChannel.setStreamHandler(null) + gyroscopeChannel.setStreamHandler(null) + magnetometerChannel.setStreamHandler(null) + } + + companion object { + private const val ACCELEROMETER_CHANNEL_NAME = "dev.fluttercommunity.plus/sensors/accelerometer" + private const val GYROSCOPE_CHANNEL_NAME = "dev.fluttercommunity.plus/sensors/gyroscope" + private const val USER_ACCELEROMETER_CHANNEL_NAME = "dev.fluttercommunity.plus/sensors/user_accel" + private const val MAGNETOMETER_CHANNEL_NAME = "dev.fluttercommunity.plus/sensors/magnetometer" + } +} diff --git a/packages/sensors_plus/sensors_plus/android/src/main/kotlin/dev/fluttercommunity/plus/sensors/StreamHandlerImpl.kt b/packages/sensors_plus/sensors_plus/android/src/main/kotlin/dev/fluttercommunity/plus/sensors/StreamHandlerImpl.kt new file mode 100644 index 0000000000..521e9243e9 --- /dev/null +++ b/packages/sensors_plus/sensors_plus/android/src/main/kotlin/dev/fluttercommunity/plus/sensors/StreamHandlerImpl.kt @@ -0,0 +1,42 @@ +package dev.fluttercommunity.plus.sensors + +import android.hardware.Sensor +import android.hardware.SensorEvent +import android.hardware.SensorEventListener +import android.hardware.SensorManager +import io.flutter.plugin.common.EventChannel +import io.flutter.plugin.common.EventChannel.EventSink + +internal class StreamHandlerImpl( + private val sensorManager: SensorManager, + sensorType: Int +) : EventChannel.StreamHandler { + private lateinit var sensorEventListener: SensorEventListener + + private val sensor: Sensor by lazy { + sensorManager.getDefaultSensor(sensorType) + } + + override fun onListen(arguments: Any?, events: EventSink) { + sensorEventListener = createSensorEventListener(events) + sensorManager.registerListener(sensorEventListener, sensor, SensorManager.SENSOR_DELAY_NORMAL) + } + + override fun onCancel(arguments: Any?) { + sensorManager.unregisterListener(sensorEventListener) + } + + private fun createSensorEventListener(events: EventSink): SensorEventListener { + return object : SensorEventListener { + override fun onAccuracyChanged(sensor: Sensor, accuracy: Int) {} + + override fun onSensorChanged(event: SensorEvent) { + val sensorValues = DoubleArray(event.values.size) + event.values.forEachIndexed { index, value -> + sensorValues[index] = value.toDouble() + } + events.success(sensorValues) + } + } + } +} diff --git a/packages/sensors_plus/sensors_plus/example/android/build.gradle b/packages/sensors_plus/sensors_plus/example/android/build.gradle index 9971094448..36e820e110 100644 --- a/packages/sensors_plus/sensors_plus/example/android/build.gradle +++ b/packages/sensors_plus/sensors_plus/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.0.4' } } diff --git a/packages/sensors_plus/sensors_plus/example/android/gradle.properties b/packages/sensors_plus/sensors_plus/example/android/gradle.properties index 94adc3a3f9..d9cf55df7c 100644 --- a/packages/sensors_plus/sensors_plus/example/android/gradle.properties +++ b/packages/sensors_plus/sensors_plus/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/sensors_plus/sensors_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/sensors_plus/sensors_plus/example/android/gradle/wrapper/gradle-wrapper.properties index cb2d28054d..8d8786327e 100644 --- a/packages/sensors_plus/sensors_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/sensors_plus/sensors_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Tue Oct 05 15:47:01 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/packages/sensors_plus/sensors_plus/pubspec.yaml b/packages/sensors_plus/sensors_plus/pubspec.yaml index dd8f8786f1..a19cab6a79 100644 --- a/packages/sensors_plus/sensors_plus/pubspec.yaml +++ b/packages/sensors_plus/sensors_plus/pubspec.yaml @@ -2,7 +2,7 @@ name: sensors_plus description: > Flutter plugin for accessing accelerometer, gyroscope, and magnetometer sensors. -version: 1.2.1 +version: 1.3.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ From cf5407ad73c0ef9dc268eeb8e2442ce9dac23049 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Fri, 24 Dec 2021 17:41:38 +0200 Subject: [PATCH 2/9] Update README --- packages/sensors_plus/sensors_plus/README.md | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/sensors_plus/sensors_plus/README.md b/packages/sensors_plus/sensors_plus/README.md index 5278df0ee9..861d8eb63c 100644 --- a/packages/sensors_plus/sensors_plus/README.md +++ b/packages/sensors_plus/sensors_plus/README.md @@ -1,13 +1,14 @@ -# sensors - [![Flutter Community: sensors_plus](https://fluttercommunity.dev/_github/header/sensors_plus)](https://github.com/fluttercommunity/community) - [![pub package](https://img.shields.io/pub/v/sensors_plus.svg)](https://pub.dev/packages/sensors_plus) -

-

build
+

+ + build +

+## Sensors Plus + A Flutter plugin to access the accelerometer, gyroscope, and magnetometer sensors. @@ -69,10 +70,4 @@ magnetometerEvents.listen((MagnetometerEvent event) { Also see the `example` subdirectory for an example application that uses the sensor data. -Check out our website to learn more: [Plus Plugins documentation](https://plus.fluttercommunity.dev/docs/overview) - -**Important:** As of January 2021, the Flutter team is no longer accepting -non-critical PRs for the original set of plugins in `flutter/plugins`, and -instead they should be submitted in this project. -[You can read more about this announcement here](https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md#important-note) -as well as [in the Flutter 2 announcement blog post](https://medium.com/flutter/whats-new-in-flutter-2-0-fe8e95ecc65). +Check out our website to learn more: [Plus Plugins documentation](https://plus.fluttercommunity.dev/docs/overview) \ No newline at end of file From 71af336094bdaa6b47153c1d1726593809237b4e Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Fri, 24 Dec 2021 17:43:27 +0200 Subject: [PATCH 3/9] Attempt to fix the image in README --- packages/sensors_plus/sensors_plus/README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/sensors_plus/sensors_plus/README.md b/packages/sensors_plus/sensors_plus/README.md index 861d8eb63c..b90ad69246 100644 --- a/packages/sensors_plus/sensors_plus/README.md +++ b/packages/sensors_plus/sensors_plus/README.md @@ -1,10 +1,8 @@ [![Flutter Community: sensors_plus](https://fluttercommunity.dev/_github/header/sensors_plus)](https://github.com/fluttercommunity/community) -[![pub package](https://img.shields.io/pub/v/sensors_plus.svg)](https://pub.dev/packages/sensors_plus) +[![pub package](https://img.shields.io/pub/v/battery_plus.svg)](https://pub.dev/packages/battery_plus) -

- - build - +

+

build

## Sensors Plus From a1f66cc4d620c441b981cb4a4f8a12a97fb90cbe Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Fri, 24 Dec 2021 17:43:59 +0200 Subject: [PATCH 4/9] Update README --- packages/sensors_plus/sensors_plus/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/sensors_plus/sensors_plus/README.md b/packages/sensors_plus/sensors_plus/README.md index b90ad69246..f12cf6ad53 100644 --- a/packages/sensors_plus/sensors_plus/README.md +++ b/packages/sensors_plus/sensors_plus/README.md @@ -1,4 +1,5 @@ [![Flutter Community: sensors_plus](https://fluttercommunity.dev/_github/header/sensors_plus)](https://github.com/fluttercommunity/community) + [![pub package](https://img.shields.io/pub/v/battery_plus.svg)](https://pub.dev/packages/battery_plus)

From 1d16f462b4a5dbcc7b3bee24dc2137e01ae8af9b Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Fri, 24 Dec 2021 17:51:11 +0200 Subject: [PATCH 5/9] Add Github Actions status for Sensors Plus --- packages/sensors_plus/sensors_plus/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/sensors_plus/sensors_plus/README.md b/packages/sensors_plus/sensors_plus/README.md index f12cf6ad53..5c27b86339 100644 --- a/packages/sensors_plus/sensors_plus/README.md +++ b/packages/sensors_plus/sensors_plus/README.md @@ -1,5 +1,6 @@ [![Flutter Community: sensors_plus](https://fluttercommunity.dev/_github/header/sensors_plus)](https://github.com/fluttercommunity/community) +[![sensors_plus](https://github.com/fluttercommunity/plus_plugins/actions/workflows/sensors_plus.yaml/badge.svg)](https://github.com/fluttercommunity/plus_plugins/actions/workflows/sensors_plus.yaml) [![pub package](https://img.shields.io/pub/v/battery_plus.svg)](https://pub.dev/packages/battery_plus)

@@ -69,4 +70,4 @@ magnetometerEvents.listen((MagnetometerEvent event) { Also see the `example` subdirectory for an example application that uses the sensor data. -Check out our website to learn more: [Plus Plugins documentation](https://plus.fluttercommunity.dev/docs/overview) \ No newline at end of file +Check out our website to learn more: [Plus Plugins documentation](https://plus.fluttercommunity.dev/docs/overview) From 1d7eb17948ab6f2121a73b3b7871dac5a146f15a Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Sat, 25 Dec 2021 20:43:44 +0200 Subject: [PATCH 6/9] Change header type for the title --- packages/sensors_plus/sensors_plus/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sensors_plus/sensors_plus/README.md b/packages/sensors_plus/sensors_plus/README.md index 5c27b86339..613e4c66aa 100644 --- a/packages/sensors_plus/sensors_plus/README.md +++ b/packages/sensors_plus/sensors_plus/README.md @@ -7,7 +7,7 @@

build

-## Sensors Plus +# Sensors Plus A Flutter plugin to access the accelerometer, gyroscope, and magnetometer sensors. From c9ef3e04767696e2fbaff50cf5b0eb84b365419f Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Sat, 25 Dec 2021 21:09:08 +0200 Subject: [PATCH 7/9] Remove redundant sourceSets block --- packages/sensors_plus/sensors_plus/android/build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/sensors_plus/sensors_plus/android/build.gradle b/packages/sensors_plus/sensors_plus/android/build.gradle index de3f543a1b..a101c9cdaf 100644 --- a/packages/sensors_plus/sensors_plus/android/build.gradle +++ b/packages/sensors_plus/sensors_plus/android/build.gradle @@ -27,10 +27,6 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 31 - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - defaultConfig { minSdkVersion 16 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From 72fd4702973ce3c7dd4e513be9205fd1a80a44dc Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Mon, 27 Dec 2021 19:25:41 +0200 Subject: [PATCH 8/9] Update README --- packages/sensors_plus/sensors_plus/README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/sensors_plus/sensors_plus/README.md b/packages/sensors_plus/sensors_plus/README.md index 613e4c66aa..b53c508563 100644 --- a/packages/sensors_plus/sensors_plus/README.md +++ b/packages/sensors_plus/sensors_plus/README.md @@ -1,13 +1,11 @@ +# Sensors Plus + [![Flutter Community: sensors_plus](https://fluttercommunity.dev/_github/header/sensors_plus)](https://github.com/fluttercommunity/community) [![sensors_plus](https://github.com/fluttercommunity/plus_plugins/actions/workflows/sensors_plus.yaml/badge.svg)](https://github.com/fluttercommunity/plus_plugins/actions/workflows/sensors_plus.yaml) [![pub package](https://img.shields.io/pub/v/battery_plus.svg)](https://pub.dev/packages/battery_plus) -

-

build
-

- -# Sensors Plus +build A Flutter plugin to access the accelerometer, gyroscope, and magnetometer sensors. From 77ddb23088bff28132aa37a02acd22cd0be24f4b Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Sun, 20 Feb 2022 16:16:44 +0200 Subject: [PATCH 9/9] More Android related updates --- packages/sensors_plus/sensors_plus/android/build.gradle | 2 +- .../example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sensors_plus/sensors_plus/android/build.gradle b/packages/sensors_plus/sensors_plus/android/build.gradle index a101c9cdaf..ee8047d168 100644 --- a/packages/sensors_plus/sensors_plus/android/build.gradle +++ b/packages/sensors_plus/sensors_plus/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/sensors_plus/sensors_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/sensors_plus/sensors_plus/example/android/gradle/wrapper/gradle-wrapper.properties index 8d8786327e..c17f829cd3 100644 --- a/packages/sensors_plus/sensors_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/sensors_plus/sensors_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME