From 65b1ff89cd8b08deb758c2ce82659950c5fc631d Mon Sep 17 00:00:00 2001 From: Rody Davis Date: Thu, 7 Feb 2019 09:11:59 -0500 Subject: [PATCH 1/3] Update pubspec.lock --- pubspec.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 66a6508..1a86b65 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,7 +5,7 @@ packages: dependency: transitive description: name: collection - url: "https://dart-pub.mirrors.sjtug.sjtu.edu.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.14.11" flutter: @@ -17,7 +17,7 @@ packages: dependency: "direct main" description: name: meta - url: "https://dart-pub.mirrors.sjtug.sjtu.edu.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.6" sky_engine: @@ -29,14 +29,14 @@ packages: dependency: transitive description: name: typed_data - url: "https://dart-pub.mirrors.sjtug.sjtu.edu.cn" + url: "https://pub.dartlang.org" source: hosted version: "1.1.6" vector_math: dependency: transitive description: name: vector_math - url: "https://dart-pub.mirrors.sjtug.sjtu.edu.cn" + url: "https://pub.dartlang.org" source: hosted version: "2.0.8" sdks: From ab6200b60a9cb6507b5271866fcb05bf81879c23 Mon Sep 17 00:00:00 2001 From: Rody Davis Date: Thu, 7 Feb 2019 10:33:37 -0500 Subject: [PATCH 2/3] Updating Android Dep --- android/build.gradle | 6 +++--- android/gradle.properties | 2 ++ android/src/main/AndroidManifest.xml | 2 +- .../java/com/zt/shareextend/ShareExtendPlugin.java | 6 +++--- example/android/app/build.gradle | 10 +++++----- example/android/build.gradle | 3 ++- example/android/gradle.properties | 2 ++ .../android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- example/pubspec.yaml | 4 ++-- 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 248131f..f2a2d24 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -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 { - api 'com.android.support:support-core-utils:27.1.1' + api 'androidx.legacy:legacy-support-core-utils:1.0.0' } diff --git a/android/gradle.properties b/android/gradle.properties index 8bd86f6..678cd62 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1 +1,3 @@ org.gradle.jvmargs=-Xmx1536M +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index b50529c..8775d1b 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ diff --git a/android/src/main/java/com/zt/shareextend/ShareExtendPlugin.java b/android/src/main/java/com/zt/shareextend/ShareExtendPlugin.java index ca127bf..f489c79 100644 --- a/android/src/main/java/com/zt/shareextend/ShareExtendPlugin.java +++ b/android/src/main/java/com/zt/shareextend/ShareExtendPlugin.java @@ -13,9 +13,9 @@ 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 android.support.v4.content.FileProvider; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; import java.io.File; diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index dd10df6..6699f6c 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,10 +35,10 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.zt.shareextendexample" minSdkVersion 19 - targetSdkVersion 27 + 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.2-alpha01' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.2-alpha01' } diff --git a/example/android/build.gradle b/example/android/build.gradle index d4225c7..2627e66 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.1' } } @@ -17,6 +17,7 @@ allprojects { } rootProject.buildDir = '../build' + subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 8bd86f6..53ae0ae 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -1 +1,3 @@ +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536M diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 9372d0f..585b78a 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 +#Thu Feb 07 10:23:11 EST 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/example/pubspec.yaml b/example/pubspec.yaml index e285c51..b498b12 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -19,8 +19,8 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^0.1.2 - image_picker: ^0.4.10 - path_provider: ^0.4.1 + image_picker: + path_provider: dev_dependencies: flutter_test: From 75e6e52117803513f5bc980b443947b5cc7e4671 Mon Sep 17 00:00:00 2001 From: Rody Davis Date: Thu, 7 Feb 2019 10:34:46 -0500 Subject: [PATCH 3/3] Updating Changelog --- CHANGELOG.md | 5 +++++ pubspec.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41cc7d8..e69b5b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.0.4 + +* Updated to Support Latest Android Dependencies + + ## 0.0.1 * TODO: Describe initial release. diff --git a/pubspec.yaml b/pubspec.yaml index 8bd1b06..aa70118 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: share_extend description: A flutter plugin to share text, image, file with system ui. It is compatible with both andorid and ios. -version: 1.0.3 +version: 1.0.4 author: zhouteng homepage: https://github.com/zhouteng0217/ShareExtend