From 3061bdb6d3980e23a5f45f72b74d31530d7e6ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Mon, 8 Feb 2016 22:01:18 +0100 Subject: [PATCH] Fix Android version --- Examples/AdvancedEffects/android/app/app.iml | 4 ++-- Examples/AdvancedEffects/ios/AdvancedEffects/AppDelegate.m | 2 +- android/RNGL.iml | 4 ++-- .../main/java/com/projectseptember/RNGL/GLCanvasManager.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Examples/AdvancedEffects/android/app/app.iml b/Examples/AdvancedEffects/android/app/app.iml index 04987cf..eface3a 100644 --- a/Examples/AdvancedEffects/android/app/app.iml +++ b/Examples/AdvancedEffects/android/app/app.iml @@ -78,7 +78,7 @@ - + @@ -97,6 +97,7 @@ + @@ -104,7 +105,6 @@ - diff --git a/Examples/AdvancedEffects/ios/AdvancedEffects/AppDelegate.m b/Examples/AdvancedEffects/ios/AdvancedEffects/AppDelegate.m index 7b781db..870a765 100644 --- a/Examples/AdvancedEffects/ios/AdvancedEffects/AppDelegate.m +++ b/Examples/AdvancedEffects/ios/AdvancedEffects/AppDelegate.m @@ -31,7 +31,7 @@ * on the same Wi-Fi network. */ - jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/index.ios.bundle?platform=ios&dev=true"]; + jsCodeLocation = [NSURL URLWithString:@"http://192.168.0.26:8081/index.ios.bundle?platform=ios&dev=true"]; /** * OPTION 2 diff --git a/android/RNGL.iml b/android/RNGL.iml index da94af0..617d45a 100644 --- a/android/RNGL.iml +++ b/android/RNGL.iml @@ -1,5 +1,5 @@ - + @@ -85,6 +85,7 @@ + @@ -92,7 +93,6 @@ - diff --git a/android/src/main/java/com/projectseptember/RNGL/GLCanvasManager.java b/android/src/main/java/com/projectseptember/RNGL/GLCanvasManager.java index ded4042..734c9b3 100644 --- a/android/src/main/java/com/projectseptember/RNGL/GLCanvasManager.java +++ b/android/src/main/java/com/projectseptember/RNGL/GLCanvasManager.java @@ -13,7 +13,7 @@ import com.facebook.react.common.MapBuilder; import com.facebook.react.uimanager.PointerEvents; import com.facebook.react.uimanager.SimpleViewManager; import com.facebook.react.uimanager.ThemedReactContext; -import com.facebook.react.uimanager.ReactProp; +import com.facebook.react.uimanager.annotations.ReactProp; import java.util.Locale; import java.util.Map; -- 2.26.2