From e9409806590a43bd759b5db3ae99d8809d71cf7d Mon Sep 17 00:00:00 2001 From: "Rohit R. Abbadi" Date: Thu, 17 Jan 2019 05:04:02 +0530 Subject: [PATCH 1/5] switch from image_picker -> image_picker_modern. Probably temporary, considering future upgrades! --- lib/file_picker.dart | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/file_picker.dart b/lib/file_picker.dart index e1f60f2..3d8254a 100644 --- a/lib/file_picker.dart +++ b/lib/file_picker.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:flutter/services.dart'; -import 'package:image_picker/image_picker.dart'; +import 'package:image_picker_modern/image_picker_modern.dart'; /// Supported file types, [ANY] should be used if the file you need isn't listed enum FileType { diff --git a/pubspec.yaml b/pubspec.yaml index ced54bd..7181bff 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,7 +8,7 @@ homepage: https://github.com/miguelpruivo/plugins_flutter_file_picker dependencies: flutter: sdk: flutter - image_picker: ^0.4.10 + image_picker_modern: ^0.4.12+1 meta: ^1.1.5 environment: From 1abab7c7fc980a0888d3b39a9f1659384a0aa578 Mon Sep 17 00:00:00 2001 From: "Rohit R. Abbadi" Date: Fri, 18 Jan 2019 16:53:38 +0530 Subject: [PATCH 2/5] upgrade for iOS fix --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 7181bff..4bf6527 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,7 +8,7 @@ homepage: https://github.com/miguelpruivo/plugins_flutter_file_picker dependencies: flutter: sdk: flutter - image_picker_modern: ^0.4.12+1 + image_picker_modern: ^0.4.13-1 meta: ^1.1.5 environment: From ec8afd4f57ddfd6b0248b7a45348f76b2c44169e Mon Sep 17 00:00:00 2001 From: Vadym Pinchuk Date: Sat, 26 Jan 2019 20:38:20 +0200 Subject: [PATCH 3/5] Replace Support with AndroidX --- CHANGELOG.md | 8 ++++++++ android/build.gradle | 8 ++++---- android/gradle.properties | 2 ++ android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../mr/flutter/plugin/filepicker/FilePickerPlugin.java | 4 ++-- example/android/app/build.gradle | 4 ++-- example/android/build.gradle | 2 +- example/android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- pubspec.yaml | 2 +- 9 files changed, 23 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 644445e..2f33353 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 1.1.2 + +* **Breaking change**. Migrate from the deprecated original Android Support + Library to AndroidX. This shouldn't result in any functional changes, but it + requires any Android apps using this plugin to [also + migrate](https://developer.android.com/jetpack/androidx/migrate) if they're + using the original support library.Q + ## 1.1.1 * Updates README file. diff --git a/android/build.gradle b/android/build.gradle index 1e9b1b1..3cde33d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.3.0' } } @@ -22,11 +22,11 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 16 - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { disable 'InvalidPackage' @@ -34,5 +34,5 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:27.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0-beta01' } diff --git a/android/gradle.properties b/android/gradle.properties index 8bd86f6..53ae0ae 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1 +1,3 @@ +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536M diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index eff8d1b..38cd10a 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerPlugin.java b/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerPlugin.java index 7fbcfa9..2c300e0 100644 --- a/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerPlugin.java +++ b/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerPlugin.java @@ -7,8 +7,8 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.os.Environment; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import android.webkit.MimeTypeMap; diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 4e4381a..18db5af 100644 --- a/example/android/app/build.gradle +++ b/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 27 + compileSdkVersion 28 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.mr.flutter.plugin.filepickerexample" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/example/android/build.gradle b/example/android/build.gradle index d4225c7..541636c 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.3.0' } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 9372d0f..8e36f14 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Sat Jan 26 11:50:40 EET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/pubspec.yaml b/pubspec.yaml index ced54bd..84ef13d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,7 +8,7 @@ homepage: https://github.com/miguelpruivo/plugins_flutter_file_picker dependencies: flutter: sdk: flutter - image_picker: ^0.4.10 + image_picker: ^0.5.0 meta: ^1.1.5 environment: From 0ee0b757ea2daa7c7a3906c94aa37dd415076ebc Mon Sep 17 00:00:00 2001 From: Miguel Ruivo Date: Tue, 5 Feb 2019 18:15:39 +0000 Subject: [PATCH 4/5] reverts image_picker_modern to file_ficker --- lib/file_picker.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/file_picker.dart b/lib/file_picker.dart index 3d8254a..e1f60f2 100644 --- a/lib/file_picker.dart +++ b/lib/file_picker.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:flutter/services.dart'; -import 'package:image_picker_modern/image_picker_modern.dart'; +import 'package:image_picker/image_picker.dart'; /// Supported file types, [ANY] should be used if the file you need isn't listed enum FileType { From 5e80e311292533e2fd89036c1570cfe1225dde5e Mon Sep 17 00:00:00 2001 From: Miguel Ruivo Date: Tue, 12 Feb 2019 11:50:51 +0000 Subject: [PATCH 5/5] updates dependencies to AndroidX --- CHANGELOG.md | 9 +++------ android/.classpath | 2 +- android/build.gradle | 2 +- android/gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/app/.classpath | 2 +- example/android/app/build.gradle | 6 +++--- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f33353..0ef564d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,7 @@ -## 1.1.2 +## 1.2.0 -* **Breaking change**. Migrate from the deprecated original Android Support - Library to AndroidX. This shouldn't result in any functional changes, but it - requires any Android apps using this plugin to [also - migrate](https://developer.android.com/jetpack/androidx/migrate) if they're - using the original support library.Q +**Breaking change** + Migrate from the deprecated original Android Support Library to AndroidX. This shouldn't result in any functional changes, but it requires any Android apps using this plugin to [also migrate](https://developer.android.com/jetpack/androidx/migrate) if they're using the original support library. ## 1.1.1 diff --git a/android/.classpath b/android/.classpath index eb19361..3589094 100644 --- a/android/.classpath +++ b/android/.classpath @@ -1,6 +1,6 @@ - + diff --git a/android/build.gradle b/android/build.gradle index 3cde33d..c31b08b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.1' } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 38cd10a..0e301ee 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/example/android/app/.classpath b/example/android/app/.classpath index eb19361..3589094 100644 --- a/example/android/app/.classpath +++ b/example/android/app/.classpath @@ -1,6 +1,6 @@ - + diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 18db5af..db4fb56 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -38,7 +38,7 @@ android { targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -56,6 +56,6 @@ flutter { dependencies { testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test:runner:1.1.0-alpha4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4' }