diff --git a/packages/share_plus/share_plus/CHANGELOG.md b/packages/share_plus/share_plus/CHANGELOG.md index 96b41ed0c5..84fe98b280 100644 --- a/packages/share_plus/share_plus/CHANGELOG.md +++ b/packages/share_plus/share_plus/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.0.1 + +- Update Android dependencies for plugin and example, bump compileSDK to 31 + ## 3.0.0 - Remove deprecated method `registerWith` (of Android v1 embedding) diff --git a/packages/share_plus/share_plus/example/android/app/build.gradle b/packages/share_plus/share_plus/example/android/app/build.gradle index d9e11b65ef..8c0a10bb9c 100644 --- a/packages/share_plus/share_plus/example/android/app/build.gradle +++ b/packages/share_plus/share_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 30 + compileSdkVersion 31 lintOptions { disable 'InvalidPackage' @@ -34,7 +34,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.shareexample" minSdkVersion 16 - targetSdkVersion 30 + 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/share_plus/share_plus/example/android/app/src/main/AndroidManifest.xml b/packages/share_plus/share_plus/example/android/app/src/main/AndroidManifest.xml index 350fdaf583..471ed317b7 100644 --- a/packages/share_plus/share_plus/example/android/app/src/main/AndroidManifest.xml +++ b/packages/share_plus/share_plus/example/android/app/src/main/AndroidManifest.xml @@ -4,17 +4,11 @@ - - diff --git a/packages/share_plus/share_plus/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java b/packages/share_plus/share_plus/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java deleted file mode 100644 index 3dfae43004..0000000000 --- a/packages/share_plus/share_plus/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java +++ /dev/null @@ -1,21 +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 io.flutter.plugins.shareexample; - -import android.os.Bundle; -import dev.flutter.plugins.integration_test.IntegrationTestPlugin; -import dev.fluttercommunity.plus.share.SharePlusPlugin; -import io.flutter.app.FlutterActivity; - -public class EmbeddingV1Activity extends FlutterActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); - SharePlusPlugin.registerWith(registrarFor("dev.fluttercommunity.plus.share.SharePlusPlugin")); - } -} diff --git a/packages/share_plus/share_plus/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java b/packages/share_plus/share_plus/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java deleted file mode 100644 index b5ae4ef061..0000000000 --- a/packages/share_plus/share_plus/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.flutter.plugins.shareexample; - -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/share_plus/share_plus/example/android/app/src/main/java/io/flutter/plugins/shareexample/FlutterActivityTest.java b/packages/share_plus/share_plus/example/android/app/src/main/java/io/flutter/plugins/shareexample/FlutterActivityTest.java deleted file mode 100644 index 3b73737f15..0000000000 --- a/packages/share_plus/share_plus/example/android/app/src/main/java/io/flutter/plugins/shareexample/FlutterActivityTest.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 io.flutter.plugins.shareexample; - -import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integration_test.FlutterTestRunner; -import io.flutter.embedding.android.FlutterActivity; -import org.junit.Rule; -import org.junit.runner.RunWith; - -@RunWith(FlutterTestRunner.class) -public class FlutterActivityTest { - @Rule - public ActivityTestRule rule = new ActivityTestRule<>(FlutterActivity.class); -} diff --git a/packages/share_plus/share_plus/example/android/build.gradle b/packages/share_plus/share_plus/example/android/build.gradle index 456d020f6e..9971094448 100644 --- a/packages/share_plus/share_plus/example/android/build.gradle +++ b/packages/share_plus/share_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/share_plus/share_plus/example/android/gradle.properties b/packages/share_plus/share_plus/example/android/gradle.properties index 38c8d4544f..d9cf55df7c 100644 --- a/packages/share_plus/share_plus/example/android/gradle.properties +++ b/packages/share_plus/share_plus/example/android/gradle.properties @@ -1,4 +1,2 @@ org.gradle.jvmargs=-Xmx1536M -android.enableR8=true android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/share_plus/share_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/share_plus/share_plus/example/android/gradle/wrapper/gradle-wrapper.properties index d757f3d33f..6dd0229556 100644 --- a/packages/share_plus/share_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/share_plus/share_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Tue Oct 05 15:14:03 EEST 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.4.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/packages/share_plus/share_plus/example/lib/main.dart b/packages/share_plus/share_plus/example/lib/main.dart index 166cadfc5d..9eb99f4d4c 100644 --- a/packages/share_plus/share_plus/example/lib/main.dart +++ b/packages/share_plus/share_plus/example/lib/main.dart @@ -65,7 +65,7 @@ class DemoAppState extends State { title: Text('Add image'), onTap: () async { final imagePicker = ImagePicker(); - final pickedFile = await imagePicker.getImage( + final pickedFile = await imagePicker.pickImage( source: ImageSource.gallery, ); if (pickedFile != null) { diff --git a/packages/share_plus/share_plus/example/pubspec.yaml b/packages/share_plus/share_plus/example/pubspec.yaml index 83ecb49c21..e73c9e6665 100644 --- a/packages/share_plus/share_plus/example/pubspec.yaml +++ b/packages/share_plus/share_plus/example/pubspec.yaml @@ -6,7 +6,7 @@ dependencies: sdk: flutter share_plus: path: ../ - image_picker: ^0.7.0 + image_picker: ^0.8.4 dev_dependencies: flutter_driver: diff --git a/packages/share_plus/share_plus/pubspec.yaml b/packages/share_plus/share_plus/pubspec.yaml index d60a632229..f590ce2cde 100644 --- a/packages/share_plus/share_plus/pubspec.yaml +++ b/packages/share_plus/share_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: share_plus description: Flutter plugin for sharing content via the platform share UI, using the ACTION_SEND intent on Android and UIActivityViewController on iOS. -version: 3.0.0 +version: 3.0.1 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/