From d35eb8789d1059ad29f7e1c52e76d21d7092216f Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 15:49:46 +0200 Subject: [PATCH 1/5] imp: upgrade gradle and android compile SDK version --- .../sensors_plus/sensors_plus/android/build.gradle | 4 ++-- .../sensors_plus/example/android/app/build.gradle | 10 +++++----- .../example/android/app/src/main/AndroidManifest.xml | 3 ++- .../sensors_plus/example/android/build.gradle | 2 +- .../sensors_plus/example/android/gradle.properties | 1 - .../android/gradle/wrapper/gradle-wrapper.properties | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/sensors_plus/sensors_plus/android/build.gradle b/packages/sensors_plus/sensors_plus/android/build.gradle index 2bc84789e7..99f54fe8b3 100644 --- a/packages/sensors_plus/sensors_plus/android/build.gradle +++ b/packages/sensors_plus/sensors_plus/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.0.2' } } @@ -22,7 +22,7 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 28 + compileSdkVersion 31 defaultConfig { minSdkVersion 16 diff --git a/packages/sensors_plus/sensors_plus/example/android/app/build.gradle b/packages/sensors_plus/sensors_plus/example/android/app/build.gradle index 987def4635..5080e7d83e 100644 --- a/packages/sensors_plus/sensors_plus/example/android/app/build.gradle +++ b/packages/sensors_plus/sensors_plus/example/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 28 + compileSdkVersion 31 lintOptions { disable 'InvalidPackage' @@ -34,7 +34,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.sensorsexample" minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -54,7 +54,7 @@ flutter { } dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } diff --git a/packages/sensors_plus/sensors_plus/example/android/app/src/main/AndroidManifest.xml b/packages/sensors_plus/sensors_plus/example/android/app/src/main/AndroidManifest.xml index 5c12a301b6..e277be72c0 100644 --- a/packages/sensors_plus/sensors_plus/example/android/app/src/main/AndroidManifest.xml +++ b/packages/sensors_plus/sensors_plus/example/android/app/src/main/AndroidManifest.xml @@ -15,7 +15,8 @@ android:theme="@android:style/Theme.Black.NoTitleBar" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection" android:hardwareAccelerated="true" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true"> diff --git a/packages/sensors_plus/sensors_plus/example/android/build.gradle b/packages/sensors_plus/sensors_plus/example/android/build.gradle index 456d020f6e..9971094448 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:3.5.0' + classpath 'com.android.tools.build:gradle:7.0.2' } } diff --git a/packages/sensors_plus/sensors_plus/example/android/gradle.properties b/packages/sensors_plus/sensors_plus/example/android/gradle.properties index 38c8d4544f..94adc3a3f9 100644 --- a/packages/sensors_plus/sensors_plus/example/android/gradle.properties +++ b/packages/sensors_plus/sensors_plus/example/android/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx1536M -android.enableR8=true 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 c9aebbe14f..cb2d28054d 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,6 @@ +#Tue Oct 05 15:47:01 CEST 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -# distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +zipStoreBase=GRADLE_USER_HOME From b4816d010996f74fa59dd69583b5384246bc3a49 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 15:50:57 +0200 Subject: [PATCH 2/5] imp: remove old embedding v1 reference --- .../android/src/main/AndroidManifest.xml | 3 +-- .../android/app/src/main/AndroidManifest.xml | 7 ------- .../sensorsexample/EmbeddingV1Activity.java | 20 ------------------- .../EmbeddingV1ActivityTest.java | 13 ------------ 4 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 packages/sensors_plus/sensors_plus/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java delete mode 100644 packages/sensors_plus/sensors_plus/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java 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 7ce25a5146..8b4504ee4c 100644 --- a/packages/sensors_plus/sensors_plus/android/src/main/AndroidManifest.xml +++ b/packages/sensors_plus/sensors_plus/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + diff --git a/packages/sensors_plus/sensors_plus/example/android/app/src/main/AndroidManifest.xml b/packages/sensors_plus/sensors_plus/example/android/app/src/main/AndroidManifest.xml index e277be72c0..b474bff221 100644 --- a/packages/sensors_plus/sensors_plus/example/android/app/src/main/AndroidManifest.xml +++ b/packages/sensors_plus/sensors_plus/example/android/app/src/main/AndroidManifest.xml @@ -4,13 +4,6 @@ - - rule = - new ActivityTestRule<>(EmbeddingV1Activity.class); -} From e2307e8d3c959992a20be10c312c0ea96b13fd01 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 15:54:27 +0200 Subject: [PATCH 3/5] imp: remove old embedding v1 reference + code improvements --- .../EmbeddingV1Activity.java | 18 ----------------- .../EmbeddingV1ActivityTest.java | 17 ---------------- .../plus/sensors/SensorsPlugin.java | 20 ++++++++----------- .../plus/sensors/StreamHandlerImpl.java | 2 +- 4 files changed, 9 insertions(+), 48 deletions(-) delete mode 100644 packages/network_info_plus/network_info_plus/example/android/app/src/main/java/dev/fluttercommunity/plus/network_info_plus_example/EmbeddingV1Activity.java delete mode 100644 packages/network_info_plus/network_info_plus/example/android/app/src/main/java/dev/fluttercommunity/plus/network_info_plus_example/EmbeddingV1ActivityTest.java diff --git a/packages/network_info_plus/network_info_plus/example/android/app/src/main/java/dev/fluttercommunity/plus/network_info_plus_example/EmbeddingV1Activity.java b/packages/network_info_plus/network_info_plus/example/android/app/src/main/java/dev/fluttercommunity/plus/network_info_plus_example/EmbeddingV1Activity.java deleted file mode 100644 index 3656874ed8..0000000000 --- a/packages/network_info_plus/network_info_plus/example/android/app/src/main/java/dev/fluttercommunity/plus/network_info_plus_example/EmbeddingV1Activity.java +++ /dev/null @@ -1,18 +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.network_info_plus_example; - -import android.os.Bundle; -import dev.fluttercommunity.plus.network_info.NetworkInfoPlusPlugin; -import io.flutter.app.FlutterActivity; - -public class EmbeddingV1Activity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - NetworkInfoPlusPlugin.registerWith( - registrarFor("dev.fluttercommunity.plus.network_info.NetworkPlusPlugin")); - } -} diff --git a/packages/network_info_plus/network_info_plus/example/android/app/src/main/java/dev/fluttercommunity/plus/network_info_plus_example/EmbeddingV1ActivityTest.java b/packages/network_info_plus/network_info_plus/example/android/app/src/main/java/dev/fluttercommunity/plus/network_info_plus_example/EmbeddingV1ActivityTest.java deleted file mode 100644 index e17382feaa..0000000000 --- a/packages/network_info_plus/network_info_plus/example/android/app/src/main/java/dev/fluttercommunity/plus/network_info_plus_example/EmbeddingV1ActivityTest.java +++ /dev/null @@ -1,17 +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.network_info_plus_example; - -import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integration_test.FlutterTestRunner; -import org.junit.Rule; -import org.junit.runner.RunWith; - -@RunWith(FlutterTestRunner.class) -public class EmbeddingV1ActivityTest { - @Rule - public ActivityTestRule rule = - new ActivityTestRule<>(EmbeddingV1Activity.class); -} 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 index ea32611853..76417d0d81 100644 --- 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 @@ -7,10 +7,12 @@ 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; -import io.flutter.plugin.common.PluginRegistry.Registrar; /** SensorsPlugin */ public class SensorsPlugin implements FlutterPlugin { @@ -28,12 +30,6 @@ public class SensorsPlugin implements FlutterPlugin { private EventChannel gyroscopeChannel; private EventChannel magnetometerChannel; - /** Plugin registration. */ - public static void registerWith(Registrar registrar) { - SensorsPlugin plugin = new SensorsPlugin(); - plugin.setupEventChannels(registrar.context(), registrar.messenger()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { final Context context = binding.getApplicationContext(); @@ -41,7 +37,7 @@ public void onAttachedToEngine(FlutterPluginBinding binding) { } @Override - public void onDetachedFromEngine(FlutterPluginBinding binding) { + public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) { teardownEventChannels(); } @@ -49,28 +45,28 @@ 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), + (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), + (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), + (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), + (SensorManager) context.getSystemService(Context.SENSOR_SERVICE), Sensor.TYPE_MAGNETIC_FIELD); magnetometerChannel.setStreamHandler(magnetometerStreamHandler); } 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 index 36a6d6017b..6a860ce1da 100644 --- 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 @@ -24,7 +24,7 @@ class StreamHandlerImpl implements EventChannel.StreamHandler { @Override public void onListen(Object arguments, EventChannel.EventSink events) { sensorEventListener = createSensorEventListener(events); - sensorManager.registerListener(sensorEventListener, sensor, sensorManager.SENSOR_DELAY_NORMAL); + sensorManager.registerListener(sensorEventListener, sensor, SensorManager.SENSOR_DELAY_NORMAL); } @Override From fd234a2696e2fb70df203e5f95c5e78056c72c6e Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 15:57:45 +0200 Subject: [PATCH 4/5] style: melos format --- .../java/dev/fluttercommunity/plus/sensors/SensorsPlugin.java | 2 -- 1 file changed, 2 deletions(-) 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 index 76417d0d81..0418741057 100644 --- 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 @@ -7,9 +7,7 @@ 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; From 39d59ee9d1d539f6504d1109daf331e705077882 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 15:58:07 +0200 Subject: [PATCH 5/5] bump version to 1.2.1 --- packages/sensors_plus/sensors_plus/CHANGELOG.md | 5 +++++ packages/sensors_plus/sensors_plus/pubspec.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/sensors_plus/sensors_plus/CHANGELOG.md b/packages/sensors_plus/sensors_plus/CHANGELOG.md index d8380b1711..7aa1b70487 100644 --- a/packages/sensors_plus/sensors_plus/CHANGELOG.md +++ b/packages/sensors_plus/sensors_plus/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.2.1 + +- Upgrade Android compile SDK version +- Several code improvements + ## 1.2.0 - migrate integration_test to flutter sdk diff --git a/packages/sensors_plus/sensors_plus/pubspec.yaml b/packages/sensors_plus/sensors_plus/pubspec.yaml index 73f995086d..2ccfec5776 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.0 +version: 1.2.1 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/