kotlin-> 1.2.71

a0290fda · JarvanMo · eecbb233 · a0290fda · a0290fda · a0290fda
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,14 +2,14 @@ group 'com.jarvan.fluwx'
 version '1.0-SNAPSHOT'

 buildscript {
-    ext.kotlin_version = '1.2.60'
+    ext.kotlin_version = '1.2.71'
    repositories {
        google()
        jcenter()
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }
 }
@@ -32,7 +32,7 @@ android {
    }
    defaultConfig {
        minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
    lintOptions {
        disable 'InvalidPackage'
@@ -42,9 +42,9 @@ android {
 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
    api 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.1.4'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.24.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.2'
 //    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-common:0.24.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.24.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.30.2'
    implementation 'top.zibin:Luban:1.1.8'
    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
 }
--- a/android/src/main/kotlin/com/jarvan/fluwx/handler/FluwxShareHandler.kt
+++ b/android/src/main/kotlin/com/jarvan/fluwx/handler/FluwxShareHandler.kt
@@ -24,10 +24,8 @@ import com.tencent.mm.opensdk.modelmsg.*
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.PluginRegistry
-import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.experimental.*
 import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.async
-import kotlinx.coroutines.experimental.launch


 /***
@@ -115,7 +113,7 @@ internal object FluwxShareHandler {
        msg.description = call.argument("description")               // 小程序消息desc
        val thumbnail: String? = call.argument(WechatPluginKeys.THUMBNAIL)

-        launch((UI)) {
+        GlobalScope.launch((Dispatchers.Main), CoroutineStart.DEFAULT, {
            if (thumbnail.isNullOrBlank()) {
                msg.thumbData = null
            } else {
@@ -132,38 +130,38 @@ internal object FluwxShareHandler {
                    )
            )

-        }
+        })


    }

    private suspend fun getThumbnailByteArrayMiniProgram(registrar: PluginRegistry.Registrar?, thumbnail: String): ByteArray {

-        return async(CommonPool) {
+        return GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT, {
            val result = WeChatThumbnailUtil.thumbnailForMiniProgram(thumbnail, registrar)
            result ?: byteArrayOf()
-        }.await()
+        }).await()
    }

    private suspend fun getImageByteArrayCommon(registrar: PluginRegistry.Registrar?, imagePath: String): ByteArray {
-        return async(CommonPool) {
+        return GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT, {
            val result = ShareImageUtil.getImageData(registrar, imagePath)
            result ?: byteArrayOf()
-        }.await()
+        }).await()
    }

    private suspend fun getThumbnailByteArrayCommon(registrar: PluginRegistry.Registrar?, thumbnail: String): ByteArray {
-        return async(CommonPool) {
+        return GlobalScope.async(Dispatchers.Default, CoroutineStart.DEFAULT, {
            val result = WeChatThumbnailUtil.thumbnailForCommon(thumbnail, registrar)
            result ?: byteArrayOf()
-        }.await()
+        }).await()
    }

    private fun shareImage(call: MethodCall, result: MethodChannel.Result) {
        val imagePath = call.argument<String>(WechatPluginKeys.IMAGE)


-        launch(UI) {
+        GlobalScope.launch(Dispatchers.Main, CoroutineStart.DEFAULT, {
            val byteArray: ByteArray? = if (imagePath.isNullOrBlank()){
                byteArrayOf()
            }else{
@@ -191,7 +189,7 @@ internal object FluwxShareHandler {

 //           val thumbnailData =  Util.bmpToByteArray(bitmap,true)
            handleShareImage(imgObj, call, thumbnailData, result)
-        }
+        })

    }

@@ -237,7 +235,7 @@ internal object FluwxShareHandler {
        msg.description = call.argument("description")
        val thumbnail: String? = call.argument("thumbnail")

-        launch(UI) {
+        GlobalScope.launch(Dispatchers.Main, CoroutineStart.DEFAULT, {
            if (thumbnail != null && thumbnail.isNotBlank()) {
                msg.thumbData = getThumbnailByteArrayCommon(registrar, thumbnail)
            }
@@ -252,7 +250,7 @@ internal object FluwxShareHandler {
                            WechatPluginKeys.RESULT to done
                    )
            )
-        }
+        })


    }
@@ -272,7 +270,7 @@ internal object FluwxShareHandler {
        msg.description = call.argument(WechatPluginKeys.DESCRIPTION)
        val thumbnail: String? = call.argument(WechatPluginKeys.THUMBNAIL)

-        launch(UI) {
+        GlobalScope.launch(Dispatchers.Main, CoroutineStart.DEFAULT,  {
            if (thumbnail != null && thumbnail.isNotBlank()) {
                msg.thumbData = getThumbnailByteArrayCommon(registrar, thumbnail)
            }
@@ -286,7 +284,7 @@ internal object FluwxShareHandler {
                            WechatPluginKeys.RESULT to done
                    )
            )
-        }
+        })


    }
@@ -301,7 +299,7 @@ internal object FluwxShareHandler {
        msg.title = call.argument(WechatPluginKeys.TITLE)
        msg.description = call.argument(WechatPluginKeys.DESCRIPTION)
        val thumbnail: String? = call.argument(WechatPluginKeys.THUMBNAIL)
-        launch(UI) {
+        GlobalScope.launch(Dispatchers.Main, CoroutineStart.DEFAULT, {
            if (thumbnail != null && thumbnail.isNotBlank()) {
                msg.thumbData = getThumbnailByteArrayCommon(registrar, thumbnail)
            }
@@ -315,7 +313,7 @@ internal object FluwxShareHandler {
                            WechatPluginKeys.RESULT to done
                    )
            )
-        }
+        })
    }

    //    private fun createWxImageObject(imagePath:String):WXImageObject?{

--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -16,7 +16,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

 android {
-    compileSdkVersion 27
+    compileSdkVersion 28

    sourceSets {
        main.java.srcDirs += 'src/main/kotlin'
@@ -29,10 +29,10 @@ android {
    defaultConfig {
        applicationId "net.sourceforge.simcpux"
        minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
        versionCode 1
        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

    buildTypes {
@@ -61,7 +61,7 @@ flutter {
 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'androidx.test:runner:1.1.0-beta01'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta01'

 }
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
 buildscript {
-    ext.kotlin_version = '1.2.60'
+    ext.kotlin_version = '1.2.71'
    repositories {
        google()
        jcenter()

--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M