From 65a72548540b007a91b0d5a764e4b8ade0e08496 Mon Sep 17 00:00:00 2001 From: Andrew Goodale Date: Thu, 21 Dec 2017 16:08:28 -0500 Subject: [PATCH] Fix compile error from change to JavaScriptExecutorFactory constructor --- android/build.gradle | 2 +- .../main/java/com/reactlibrary/ReactContextBuilder.java | 8 +++++++- package.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index c72606f..b0cd727 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:1.3.1' + classpath 'com.android.tools.build:gradle:2.2.3' } } diff --git a/android/src/main/java/com/reactlibrary/ReactContextBuilder.java b/android/src/main/java/com/reactlibrary/ReactContextBuilder.java index e2ebdfe..37a7b35 100644 --- a/android/src/main/java/com/reactlibrary/ReactContextBuilder.java +++ b/android/src/main/java/com/reactlibrary/ReactContextBuilder.java @@ -1,6 +1,7 @@ package com.reactlibrary; import android.content.Context; +import android.net.Uri; import com.facebook.react.NativeModuleRegistryBuilder; import com.facebook.react.ReactPackage; @@ -20,6 +21,8 @@ import com.facebook.soloader.SoLoader; import java.util.ArrayList; import java.util.concurrent.Callable; +import static com.facebook.react.modules.systeminfo.AndroidInfoHelpers.getFriendlyDeviceName; + public class ReactContextBuilder { private Context parentContext; @@ -54,7 +57,10 @@ public class ReactContextBuilder { } public ReactApplicationContext build() throws Exception { - JavaScriptExecutor jsExecutor = new JSCJavaScriptExecutorFactory().create(); + String appName = Uri.encode(parentContext.getPackageName()); + String deviceName = Uri.encode(getFriendlyDeviceName()); + JavaScriptExecutor jsExecutor = new JSCJavaScriptExecutorFactory(appName, deviceName) + .create(); // fresh new react context final ReactApplicationContext reactContext = new ReactApplicationContext(parentContext); diff --git a/package.json b/package.json index 4f3830e..9b005cb 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,6 @@ "index.js" ], "peerDependencies": { - "react-native": "~0.49.0" + "react-native": ">=0.50.0" } } -- 2.26.2