Remove react-native-native-modules dependency.

kiwicom · Jun 14, 2018 · 5314a4f · 5314a4f
1 parent d2d2a49
commit 5314a4f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 20 deletions.
diff --git a/RNAndroidPlayground/dependencies.gradle b/RNAndroidPlayground/dependencies.gradle
@@ -1,7 +1,7 @@
 ext {
     gradlePluginVersion = "3.0.1"
 
-    minSdkVersionVar = 19
+    minSdkVersionVar = 16
     compileSdkVersionVar = 27
     targetSdkVersionVar = 27
     buildToolsVersionVar = "27.0.3"

diff --git a/android/app/src/main/java/com/reactnativeapp/MainApplication.java b/android/app/src/main/java/com/reactnativeapp/MainApplication.java
@@ -1,29 +1,29 @@
 package com.reactnativeapp;
 
-import android.app.Application;
 import android.support.multidex.MultiDexApplication;
 
-import com.facebook.react.ReactApplication;
-import cl.json.RNSharePackage;
-import cl.json.ShareApplication;
-import org.wonday.pdf.RCTPdfView;
 import com.RNFetchBlob.RNFetchBlobPackage;
-import com.reactlibrary.RNTooltipsPackage;
+import com.airbnb.android.react.maps.MapsPackage;
+import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
 import com.oblador.vectoricons.VectorIconsPackage;
-import com.airbnb.android.react.maps.MapsPackage;
-import com.trinerdis.skypicker.colors.RNColorsPackage;
-import com.trinerdis.skypicker.currency.RNCurrencyManagerPackage;
-import com.trinerdis.skypicker.device.RNDeviceInfoPackage;
-import com.trinerdis.skypicker.logging.RNLoggingPackage;
-import com.trinerdis.skypicker.translation.*;
+import com.reactlibrary.RNTooltipsPackage;
+import com.skypicker.reactnative.nativemodules.currency.RNCurrencyManagerPackage;
+import com.skypicker.reactnative.nativemodules.device.RNDeviceInfoPackage;
+import com.skypicker.reactnative.nativemodules.logging.RNLoggingPackage;
+import com.skypicker.reactnative.nativemodules.translation.RNTranslationManagerPackage;
+
+import org.wonday.pdf.RCTPdfView;
 
 import java.util.Arrays;
 import java.util.List;
 
+import cl.json.RNSharePackage;
+import cl.json.ShareApplication;
+
 public class MainApplication extends MultiDexApplication implements ShareApplication, ReactApplication {
 
     private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
@@ -44,7 +44,6 @@ protected List<ReactPackage> getPackages() {
                     new MapsPackage(),
                     new RNLoggingPackage(),
                     new RNTranslationManagerPackage(),
-                    new RNColorsPackage(),
                     new RNCurrencyManagerPackage(),
                     new RNDeviceInfoPackage()
             );

diff --git a/android/build.gradle b/android/build.gradle
@@ -11,6 +11,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$gradlePluginVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/android/dependencies.gradle b/android/dependencies.gradle
@@ -1,5 +1,6 @@
 ext {
     gradlePluginVersion = "3.0.1"
+    kotlinVersion = "1.2.31"
 
     compileSdkVersionVar = 27
     targetSdkVersionVar = 27

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -14,6 +14,6 @@ project(':react-native-vector-icons').projectDir = new File(rootProject.projectD
 include ':react-native-maps'
 project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/lib/android')
 include ':react-native-native-modules'
-project(':react-native-native-modules').projectDir = new File(rootProject.projectDir, '../node_modules/@kiwicom/react-native-native-modules/android')
+project(':react-native-native-modules').projectDir = new File(rootProject.projectDir, '../RNAndroidPlayground/react-native-native-modules/')
 
 include ':app'
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -6,7 +6,6 @@
   "dependencies": {
     "@kiwicom/mobile-accessibility": "^0",
     "@kiwicom/mobile-localization": "^0",
-    "@kiwicom/react-native-native-modules": "^0.1.25",
     "@ptomasroos/react-native-multi-slider": "^0.0.14",
     "react-native-image-progress": "^1.1.0",
     "react-native-modal": "^6.0.0",

diff --git a/yarn.lock b/yarn.lock
@@ -527,10 +527,6 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@kiwicom/react-native-native-modules@^0.1.25":
-  version "0.1.25"
-  resolved "https://registry.yarnpkg.com/@kiwicom/react-native-native-modules/-/react-native-native-modules-0.1.25.tgz#0668621aac2ba64d22a23328612de4f8ca8f1f75"
-
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"