feat: [Android] Use root project SDK. Update kotlin to 1.4.0 (#216)

Vydia · Sep 8, 2020 · b8eaa84 · b8eaa84
1 parent 8e50ed7
commit b8eaa84
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlinVersion = '1.3.41'
+        kotlinVersion = '1.4.0'
         buildToolsVersion = '29.0.2'
         compileSdkVersion = 29
         targetSdkVersion = 29
@@ -26,13 +26,17 @@ def DEFAULT_COMPILE_SDK_VERSION = 28
 def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3"
 def DEFAULT_TARGET_SDK_VERSION = 28
 
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? project.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
-    buildToolsVersion project.hasProperty('buildToolsVersion') ? project.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
+    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
+    buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? project.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
+        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
         versionCode 1
         versionName "1.0"
         ndk {
@@ -54,6 +58,8 @@ def _kotlinVersion = _ext.has('detoxKotlinVersion') ? _ext.detoxKotlinVersion :
 def _kotlinStdlib = _ext.has('detoxKotlinStdlib') ? _ext.detoxKotlinStdlib : 'kotlin-stdlib-jdk8'
 
 dependencies {
+    implementation "androidx.core:core-ktx:1.0.1"
+
     implementation 'com.facebook.react:react-native:+'
 
     implementation "org.jetbrains.kotlin:$_kotlinStdlib:$_kotlinVersion"

diff --git a/android/src/main/java/com/vydia/RNUploader/NotificationActionsReceiver.kt b/android/src/main/java/com/vydia/RNUploader/NotificationActionsReceiver.kt
@@ -21,7 +21,7 @@ class NotificationActionsReceiver : BroadcastReceiver() {
     }
 
     if (NotificationActions().ACTION_CANCEL_UPLOAD == intent.getStringExtra(NotificationActions().PARAM_ACTION)) {
-      onUserRequestedUploadCancellation(context!!, intent.getStringExtra(NotificationActions().PARAM_UPLOAD_ID))
+      onUserRequestedUploadCancellation(context!!, intent.getStringExtra(NotificationActions().PARAM_UPLOAD_ID)!!)
     }
   }