Merge pull request #42 from BugsBunnyBR/master

Fixed AndroidX migration, updated libraries and small nits.
ko2ic · Sep 10, 2019 · 907d344 · 907d344
2 parents a821a96 + aa6f894
commit 907d344
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+example/ios/Flutter/flutter_export_environment.sh
 .DS_Store
 .atom/
 .idea/

diff --git a/android/build.gradle b/android/build.gradle
@@ -2,16 +2,15 @@ group 'com.ko2ic.imagedownloader'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.support:support-compat:28.0.0'
     }
 }
 
@@ -33,7 +32,7 @@ android {
     }
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'

diff --git a/android/src/main/kotlin/com/ko2ic/imagedownloader/Downloader.kt b/android/src/main/kotlin/com/ko2ic/imagedownloader/Downloader.kt
@@ -28,7 +28,7 @@ class Downloader(private val context: Context, private val request: Request) {
         receiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context?, intent: Intent?) {
                 intent ?: return
-                if (ACTION_DOWNLOAD_COMPLETE.equals(intent.action)) {
+                if (ACTION_DOWNLOAD_COMPLETE == intent.action) {
                     val id = intent.getLongExtra(EXTRA_DOWNLOAD_ID, -1)
                     resolveDownloadStatus(id, onNext, onError, onComplete)
                 }

diff --git a/...oader/ImageDownloderPermissionListener.kt → ...ader/ImageDownloaderPermissionListener.kt b/...oader/ImageDownloderPermissionListener.kt → ...ader/ImageDownloaderPermissionListener.kt
@@ -7,7 +7,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import io.flutter.plugin.common.PluginRegistry
 
-class ImageDownloderPermissionListener(private val activity: Activity) :
+class ImageDownloaderPermissionListener(private val activity: Activity) :
     PluginRegistry.RequestPermissionsResultListener {
 
     private val permissionRequestId: Int = 2578166

diff --git a/android/src/main/kotlin/com/ko2ic/imagedownloader/ImageDownloaderPlugin.kt b/android/src/main/kotlin/com/ko2ic/imagedownloader/ImageDownloaderPlugin.kt
@@ -33,14 +33,14 @@ import java.util.*
 class ImageDownloaderPlugin(
     private val registrar: Registrar,
     private val channel: MethodChannel,
-    private val permissionListener: ImageDownloderPermissionListener
+    private val permissionListener: ImageDownloaderPermissionListener
 ) : MethodCallHandler {
     companion object {
         @JvmStatic
         fun registerWith(registrar: Registrar) {
             val channel = MethodChannel(registrar.messenger(), "plugins.ko2ic.com/image_downloader")
 
-            val listener = ImageDownloderPermissionListener(registrar.activity())
+            val listener = ImageDownloaderPermissionListener(registrar.activity())
             registrar.addRequestPermissionsResultListener(listener)
 
             channel.setMethodCallHandler(ImageDownloaderPlugin(registrar, channel, listener))
@@ -167,7 +167,7 @@ class ImageDownloaderPlugin(
                 arrayOf(imageId),
                 null
             ).use {
-                if (it == null) throw IllegalStateException("$imageId is an imageId that does not exist.")
+                checkNotNull(it) { "$imageId is an imageId that does not exist." }
                 it.moveToFirst()
                 val path = it.getString(it.getColumnIndex(MediaStore.Images.Media.DATA))
                 val name = it.getString(it.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME))
@@ -204,7 +204,7 @@ class ImageDownloaderPlugin(
         private val channel: MethodChannel,
         private val context: Context
     ) :
-        ImageDownloderPermissionListener.Callback {
+        ImageDownloaderPermissionListener.Callback {
 
         var downloader: Downloader? = null
 
@@ -344,7 +344,7 @@ class ImageDownloaderPlugin(
                     arrayOf(file.absolutePath),
                     null
                 ).use {
-                    if (it == null) throw java.lang.IllegalStateException("${file.absolutePath} is not found.")
+                    checkNotNull(it) { "${file.absolutePath} is not found." }
                     it.moveToFirst()
                     it.getString(it.getColumnIndex(MediaStore.Images.Media._ID))
                 }

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 18 16:54:42 JST 2019
+#Fri Aug 30 11:33:54 BRT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip