Android & Kotlin upgrade working

Author: Emiliano Botti

README.md

@@ -68,7 +68,7 @@ Inside your `AppDelegate.m`, setup the line sdk by passing the channel id obtain
 //
 // Import the Library
 //
-@import RNLine;
+#import "RNLine-Swift.h"
 
 //
 // Setup the plugin using your CHANNEL_ID when the app finishes launching
@@ -135,22 +135,7 @@ Don't forget to add `application` function, as line's instructions indicate.
 ```
 
 3. Add `minSdkVersion = 17` in `android/build.gradle`
-4. Add LineSDK as a dependency in `android/build.gradle`
-```gradle
-android {
-  // Enable Java 1.8 support.
-  compileOptions { // <- add this block if didn't setup
-      sourceCompatibility JavaVersion.VERSION_1_8
-      targetCompatibility JavaVersion.VERSION_1_8
-  }
-  ...
-  dependencies {
-    ...
-    implementation 'com.linecorp.linesdk:linesdk:5.7.0' // <- add this line
-  }
-}
-```
-5. In your manifest add `xmlns:tools="http://schemas.android.com/tools"` in your `manifest` tag and also `tools:replace="android:allowBackup"` in your `application` tag
+4. In your manifest add `xmlns:tools="http://schemas.android.com/tools"` in your `manifest` tag and also `tools:replace="android:allowBackup"` in your `application` tag
 
 ## API
 

android/build.gradle

@@ -1,25 +1,28 @@
 buildscript {
     //Buildscript is evaluated before everything else so we can't use getExtOrDefault
-    def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['ReactNativeLine_kotlinVersion']
     ext {
-        buildToolsVersion = "30.0.2"
-        minSdkVersion = 21
-        compileSdkVersion = 28
-        targetSdkVersion = 30
+        kotlinVersion = rootProject.ext.has('kotlinVersion')
+                ? rootProject.ext.get('kotlinVersion')
+                : project.properties['ReactNativeLine_kotlinVersion']
+
+        buildToolsVersion = project.properties['ReactNativeLine_buildToolsVersion']
+        minSdkVersion = project.properties['ReactNativeLine_minSdkVersion']
+        compileSdkVersion = project.properties['ReactNativeLine_compileSdkVersion']
+        targetSdkVersion = project.properties['ReactNativeLine_targetSdkVersion']
         coroutinesAndroidVersion = "1.0.1"
         coroutinesCoreVersion = "1.0.1"
         gsonVersion = "2.8.6"
-        linesdkVersion = "5.7.0"
+        linesdkVersion = project.properties['ReactNativeLine_lineSdkVersion']
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:3.5.1"
+        classpath "com.android.tools.build:gradle:7.0.4"
         //noinspection DifferentKotlinGradleVersion
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
@@ -38,7 +41,7 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet("compileSdkVersion", 28)
+    compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
@@ -56,9 +59,10 @@ android {
 }
 
 dependencies {
+    //noinspection GradleDynamicVersion from node modules
     implementation "com.facebook.react:react-native:+"
-    implementation 'com.linecorp.linesdk:linesdk:5.7.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50"
+    implementation "com.linecorp.linesdk:linesdk:5.8.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesAndroidVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesCoreVersion"
 }

android/gradle.properties

@@ -1,5 +1,6 @@
-ReactNativeLine_kotlinVersion=1.3.50
+ReactNativeLine_kotlinVersion=1.7.21
 ReactNativeLine_compileSdkVersion=28
-ReactNativeLine_buildToolsVersion=28.0.3
-ReactNativeLine_targetSdkVersion=28
-ReactNativeLine_lineSdkVersion=5.7.0
+ReactNativeLine_minSdkVersion=21
+ReactNativeLine_buildToolsVersion=30.0.2
+ReactNativeLine_targetSdkVersion=30
+ReactNativeLine_lineSdkVersion=5.8.0