From 807a81cc1e4af39b1bc5d8ef75693c32105a4e99 Mon Sep 17 00:00:00 2001 From: Luke Williams Date: Wed, 2 Aug 2017 16:10:25 -0400 Subject: [PATCH 1/3] Urgent: Remove breaking createJSModules override Parallel change to that required in react-native-auth0: https://github.com/auth0/react-native-auth0/pull/70 --- .../main/java/com/auth0/lock/react/LockReactPackage.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/android/src/main/java/com/auth0/lock/react/LockReactPackage.java b/android/src/main/java/com/auth0/lock/react/LockReactPackage.java index 29a7e03..2ba80ee 100644 --- a/android/src/main/java/com/auth0/lock/react/LockReactPackage.java +++ b/android/src/main/java/com/auth0/lock/react/LockReactPackage.java @@ -139,15 +139,6 @@ public List createNativeModules(ReactApplicationContext reactConte return modules; } - /** - * NOT USED. This is a required override - * @see ReactPackage - */ - @Override - public List> createJSModules() { - return new ArrayList<>(); - } - /** * NOT USED. This is a required override * @see ReactPackage From 5002a5627698acbe7ff071c514ceefe314aa0c20 Mon Sep 17 00:00:00 2001 From: Luke Williams Date: Wed, 2 Aug 2017 16:18:42 -0400 Subject: [PATCH 2/3] Re-add createJSModules without @Override - Provides backward compatibility with v0.46.x and earlier --- .../src/main/java/com/auth0/lock/react/LockReactPackage.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/src/main/java/com/auth0/lock/react/LockReactPackage.java b/android/src/main/java/com/auth0/lock/react/LockReactPackage.java index 2ba80ee..a6c141e 100644 --- a/android/src/main/java/com/auth0/lock/react/LockReactPackage.java +++ b/android/src/main/java/com/auth0/lock/react/LockReactPackage.java @@ -139,6 +139,11 @@ public List createNativeModules(ReactApplicationContext reactConte return modules; } + // Required @Override for React Native v0.46.x and lower + public List> createJSModules() { + return new ArrayList<>(); + } + /** * NOT USED. This is a required override * @see ReactPackage From 0828a211d82713cbdb45e37b957a2d6c0e9c2041 Mon Sep 17 00:00:00 2001 From: Luke Williams Date: Wed, 2 Aug 2017 16:18:58 -0400 Subject: [PATCH 3/3] Update LockReactPackage.java --- .../src/main/java/com/auth0/lock/react/LockReactPackage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/auth0/lock/react/LockReactPackage.java b/android/src/main/java/com/auth0/lock/react/LockReactPackage.java index a6c141e..bad527f 100644 --- a/android/src/main/java/com/auth0/lock/react/LockReactPackage.java +++ b/android/src/main/java/com/auth0/lock/react/LockReactPackage.java @@ -143,7 +143,7 @@ public List createNativeModules(ReactApplicationContext reactConte public List> createJSModules() { return new ArrayList<>(); } - + /** * NOT USED. This is a required override * @see ReactPackage