From 659edb4710efb4b564485a5266706dcf480dd28c Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 15:19:13 +0200 Subject: [PATCH 1/5] imp: upgrade gradle and android compile sdk version --- .../device_info_plus/device_info_plus/android/build.gradle | 4 ++-- .../device_info_plus/example/android/app/build.gradle | 4 ++-- .../device_info_plus/example/android/build.gradle | 2 +- .../device_info_plus/example/android/gradle.properties | 1 - .../android/gradle/wrapper/gradle-wrapper.properties | 6 +++--- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/android/build.gradle b/packages/device_info_plus/device_info_plus/android/build.gradle index d7f4185f5c..2ac2571486 100644 --- a/packages/device_info_plus/device_info_plus/android/build.gradle +++ b/packages/device_info_plus/device_info_plus/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.1' + 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/device_info_plus/device_info_plus/example/android/app/build.gradle b/packages/device_info_plus/device_info_plus/example/android/app/build.gradle index bcab181cbb..7237fbee1a 100644 --- a/packages/device_info_plus/device_info_plus/example/android/app/build.gradle +++ b/packages/device_info_plus/device_info_plus/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 28 + compileSdkVersion 31 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -40,7 +40,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.flutter.plugins.deviceinfoexample.example" minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/device_info_plus/device_info_plus/example/android/build.gradle b/packages/device_info_plus/device_info_plus/example/android/build.gradle index 1c3dabf72d..5dba446517 100644 --- a/packages/device_info_plus/device_info_plus/example/android/build.gradle +++ b/packages/device_info_plus/device_info_plus/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/device_info_plus/device_info_plus/example/android/gradle.properties b/packages/device_info_plus/device_info_plus/example/android/gradle.properties index 38c8d4544f..94adc3a3f9 100644 --- a/packages/device_info_plus/device_info_plus/example/android/gradle.properties +++ b/packages/device_info_plus/device_info_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/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties index 296b146b73..26de0acc62 100644 --- a/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Tue Oct 05 15:15:38 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-5.6.2-all.zip +zipStoreBase=GRADLE_USER_HOME From dd01e9c10134acab81ee07cc22d23fc1cafcbd47 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 15:21:39 +0200 Subject: [PATCH 2/5] imp: set exported and remove deprecated splash screen --- .../device_info_plus/android/src/main/AndroidManifest.xml | 3 +-- .../example/android/app/src/main/AndroidManifest.xml | 7 ++----- .../plugins/deviceinfoexample/example/MainActivity.kt | 3 +-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/android/src/main/AndroidManifest.xml b/packages/device_info_plus/device_info_plus/android/src/main/AndroidManifest.xml index 9a513275a6..412ea27f53 100644 --- a/packages/device_info_plus/device_info_plus/android/src/main/AndroidManifest.xml +++ b/packages/device_info_plus/device_info_plus/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + diff --git a/packages/device_info_plus/device_info_plus/example/android/app/src/main/AndroidManifest.xml b/packages/device_info_plus/device_info_plus/example/android/app/src/main/AndroidManifest.xml index 625cff088b..948fcb66eb 100644 --- a/packages/device_info_plus/device_info_plus/example/android/app/src/main/AndroidManifest.xml +++ b/packages/device_info_plus/device_info_plus/example/android/app/src/main/AndroidManifest.xml @@ -15,7 +15,8 @@ android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true"> - diff --git a/packages/device_info_plus/device_info_plus/example/android/app/src/main/kotlin/io/flutter/plugins/deviceinfoexample/example/MainActivity.kt b/packages/device_info_plus/device_info_plus/example/android/app/src/main/kotlin/io/flutter/plugins/deviceinfoexample/example/MainActivity.kt index c48abf404a..69d0e0bfdd 100644 --- a/packages/device_info_plus/device_info_plus/example/android/app/src/main/kotlin/io/flutter/plugins/deviceinfoexample/example/MainActivity.kt +++ b/packages/device_info_plus/device_info_plus/example/android/app/src/main/kotlin/io/flutter/plugins/deviceinfoexample/example/MainActivity.kt @@ -2,5 +2,4 @@ package io.flutter.plugins.deviceinfoexample.example import io.flutter.embedding.android.FlutterActivity -class MainActivity: FlutterActivity() { -} +class MainActivity: FlutterActivity() From 933f0e334717a8fd035925716c4343ef68e57f75 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 15:22:29 +0200 Subject: [PATCH 3/5] imp: apply code improvements --- .../plus/device_info/DeviceInfoPlusPlugin.java | 5 ++++- .../plus/device_info/MethodCallHandlerImpl.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java b/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java index 138e1b808d..ad8207c9d7 100644 --- a/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java +++ b/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java @@ -5,6 +5,9 @@ package dev.fluttercommunity.plus.device_info; import android.content.Context; + +import androidx.annotation.NonNull; + import io.flutter.embedding.engine.plugins.FlutterPlugin; import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.MethodChannel; @@ -20,7 +23,7 @@ public void onAttachedToEngine(FlutterPlugin.FlutterPluginBinding binding) { } @Override - public void onDetachedFromEngine(FlutterPlugin.FlutterPluginBinding binding) { + public void onDetachedFromEngine(@NonNull FlutterPlugin.FlutterPluginBinding binding) { tearDownChannel(); } diff --git a/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.java b/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.java index d00bc10fcf..194e0916a1 100644 --- a/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.java +++ b/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.java @@ -10,6 +10,9 @@ import android.content.pm.PackageManager; import android.os.Build; import android.provider.Settings; + +import androidx.annotation.NonNull; + import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; import java.util.Arrays; @@ -35,7 +38,7 @@ class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler { } @Override - public void onMethodCall(MethodCall call, MethodChannel.Result result) { + public void onMethodCall(MethodCall call, @NonNull MethodChannel.Result result) { if (call.method.equals("getAndroidDeviceInfo")) { Map build = new HashMap<>(); build.put("board", Build.BOARD); From 99cb883d5fe393c5fc31307f71c09e78e892497b Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 15:24:56 +0200 Subject: [PATCH 4/5] style: melos format --- .../fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java | 2 -- .../plus/device_info/MethodCallHandlerImpl.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java b/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java index ad8207c9d7..2aaab0ce6a 100644 --- a/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java +++ b/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/DeviceInfoPlusPlugin.java @@ -5,9 +5,7 @@ package dev.fluttercommunity.plus.device_info; import android.content.Context; - import androidx.annotation.NonNull; - import io.flutter.embedding.engine.plugins.FlutterPlugin; import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.MethodChannel; diff --git a/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.java b/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.java index 194e0916a1..d750939fc4 100644 --- a/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.java +++ b/packages/device_info_plus/device_info_plus/android/src/main/java/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.java @@ -10,9 +10,7 @@ import android.content.pm.PackageManager; import android.os.Build; import android.provider.Settings; - import androidx.annotation.NonNull; - import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; import java.util.Arrays; From e5b0bc40901d4f5c7cb4942570f065bed1a4a091 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 15:25:17 +0200 Subject: [PATCH 5/5] bump version to 3.0.1 --- packages/device_info_plus/device_info_plus/CHANGELOG.md | 5 +++++ packages/device_info_plus/device_info_plus/pubspec.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/device_info_plus/device_info_plus/CHANGELOG.md b/packages/device_info_plus/device_info_plus/CHANGELOG.md index aeca393c19..7989daf604 100644 --- a/packages/device_info_plus/device_info_plus/CHANGELOG.md +++ b/packages/device_info_plus/device_info_plus/CHANGELOG.md @@ -1,3 +1,8 @@ +## 3.0.1 + +- Upgrade Android compile SDK version +- Several code improvements + ## 3.0.0 - Remove deprecated method `registerWith` (of Android v1 embedding) diff --git a/packages/device_info_plus/device_info_plus/pubspec.yaml b/packages/device_info_plus/device_info_plus/pubspec.yaml index c9e2845827..5972995c7a 100644 --- a/packages/device_info_plus/device_info_plus/pubspec.yaml +++ b/packages/device_info_plus/device_info_plus/pubspec.yaml @@ -1,7 +1,7 @@ name: device_info_plus description: Flutter plugin providing detailed information about the device (make, model, etc.), and Android or iOS version the app is running on. -version: 3.0.0 +version: 3.0.1 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/