Merge pull request #129 from xmartlabs/chore/dependencies-update

[Chore] Dependencies update

Author: Joaguirrem

.all-contributorsrc

@@ -1,7 +1,5 @@
 {
-  "files": [
-    "README.md"
-  ],
+  "files": ["README.md"],
   "imageSize": 100,
   "commit": false,
   "contributors": [
@@ -10,58 +8,43 @@
       "name": "Emiliano Botti",
       "avatar_url": "https://avatars0.githubusercontent.com/u/20881388?v=4",
       "profile": "https://github.com/eb16",
-      "contributions": [
-        "code"
-      ]
+      "contributions": ["code"]
     },
     {
-      "login": "Joaguirrem",
-      "name": "Joaquín Aguirre",
+      "login": "joaguirrem",
+      "name": "Joaquin Aguirre",
       "avatar_url": "https://avatars2.githubusercontent.com/u/17858453?v=4",
-      "profile": "https://github.com/Joaguirrem",
-      "contributions": [
-        "code"
-      ]
+      "profile": "https://github.com/joaguirrem",
+      "contributions": ["code"]
     },
     {
       "login": "nicoache1",
       "name": "Nicolas Hernandez",
       "avatar_url": "https://avatars0.githubusercontent.com/u/26419582?v=4",
       "profile": "https://github.com/nicoache1",
-      "contributions": [
-        "code",
-        "review"
-      ]
+      "contributions": ["code", "review"]
     },
     {
       "login": "santiagofm",
       "name": "Santiago Fernández",
       "avatar_url": "https://avatars0.githubusercontent.com/u/6749415?v=4",
       "profile": "https://github.com/santiagofm",
-      "contributions": [
-        "code",
-        "projectManagement",
-        "review"
-      ]
+      "contributions": ["code", "projectManagement", "review"]
     },
     {
       "login": "matir91",
       "name": "Matías Irland",
       "avatar_url": "https://avatars2.githubusercontent.com/u/8472881?v=4",
       "profile": "https://github.com/matir91",
-      "contributions": [
-        "review"
-      ]
+      "contributions": ["review"]
     },
     {
       "login": "MarcoF09",
       "name": "Marco Fiorito",
       "avatar_url": "https://avatars.githubusercontent.com/MarcoF09",
       "profile": "https://github.com/MarcoF09",
-      "contributions": [
-        "code",
-      ]
-    },
+      "contributions": ["code"]
+    }
   ],
   "contributorsPerLine": 7,
   "projectName": "react-native-line",

.eslintrc

@@ -72,13 +72,13 @@ buck-out/
 # Ruby / CocoaPods
 **/Pods/
 /vendor/bundle/
- 
+
 # Temporary files created by Metro to check the health of the file watcher
 .metro-health-check*
- 
+
 # testing
 /coverage
- 
+
 # Yarn
 .yarn/*
 !.yarn/patches

.gitignore

@@ -1 +1 @@
-registry=https://registry.yarnpkg.com
+registry=https://registry.yarnpkg.com

.npmignore

@@ -1,2 +1,6 @@
-package.json
-ios
+android
+ios
+node_modules
+
+README.md
+yarn.lock

.npmrc

@@ -0,0 +1,7 @@
+{
+  "arrowParens": "avoid",
+  "bracketSameLine": true,
+  "bracketSpacing": true,
+  "semi": false,
+  "singleQuote": true
+}

.prettierignore

@@ -4,6 +4,6 @@ source 'https://rubygems.org'
 ruby ">= 2.6.10"
 
 # Exclude problematic versions of cocoapods and activesupport that causes build failures.
-gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'xcodeproj', '< 1.26.0'

.prettierrc

@@ -3,19 +3,25 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name         = 'RNLine'
-  s.version      = package['version']
-  s.summary      = package['description']
-  s.license      = package['license']
+  s.name          = 'RNLine'
+  s.version       = package['version']
+  s.summary       = package['description']
+  s.license       = package['license']
 
-  s.authors      = package['author']
-  s.homepage     = package['homepage']
-  s.platform     = :ios, "11.0"
-  s.swift_version = '5.0'
+  s.authors       = package['author']
+  s.homepage      = package['homepage']
+  s.platform      = :ios, "15.1"
+  s.swift_version = '5.4'
 
-  s.source       = { :git => "" }
+  s.source        = { :git => package["repository"]["url"] }
   s.source_files  = "ios/**/*.{h,m,swift}"
 
-  s.dependency 'React-Core'
+  # Swift/Objective-C compatibility
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    'SWIFT_COMPILATION_MODE' => 'wholemodule'
+  }
+
   s.dependency 'LineSDKSwift', '~> 5.8.1'
+  s.dependency 'React-Core'
 end

.prettierrc.js

@@ -1,58 +1,38 @@
 buildscript {
-    //Buildscript is evaluated before everything else so we can't use getExtOrDefault
-    ext {
-        kotlinVersion = '1.9.24'
-        ndkVersion = "26.1.10909125"
-    }
+    def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : "1.9.24"
+
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
         classpath "com.android.tools.build:gradle"
-        //noinspection DifferentKotlinGradleVersion
-        classpath("com.facebook.react:react-native-gradle-plugin")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
+        classpath "com.facebook.react:react-native-gradle-plugin"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
-repositories {
-    google()
-    mavenCentral()
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
-apply plugin: "com.facebook.react.rootproject"
-
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
 
 android {
-    compileSdkVersion safeExtGet("compileSdkVersion", 31)
+    compileSdkVersion safeExtGet("compileSdkVersion", 35)
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 21)
-        targetSdkVersion safeExtGet('targetSdkVersion', 28)
+        minSdkVersion safeExtGet("minSdkVersion", 24)
+        targetSdkVersion safeExtGet("targetSdkVersion", 35)
         versionCode 1
-        versionName "1.0"
-    }
-
-    // Include "lib/" as sources, unfortunetely react-native link can't handle
-    // setting up alternative gradle modules. We still have "lib" defined as a
-    // standalone gradle module just to be used in AndroidNativeExample
-    sourceSets {
-        main.java.srcDirs += 'lib/src/main/java'
+        versionName "2.2.1"
     }
 }
 
 dependencies {
-    //noinspection GradleDynamicVersion from node modules
     implementation "com.facebook.react:react-native:+"
-    implementation "com.linecorp.linesdk:linesdk:5.8.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.1"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.1"
+    implementation "com.linecorp.linesdk:linesdk:5.8.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
 }

Gemfile

@@ -1,3 +1,2 @@
 android.useAndroidX=true
-
-hermesEnabled=true
+hermesEnabled=true

RNLine.podspec

@@ -1,3 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.xmartlabs.rnline">
-</manifest>
+    package="com.xmartlabs.rnline"></manifest>