diff --git a/android/RNGL.iml b/android/RNGL.iml index fc2aab2125900469ae8d4b5d6354392483e63639..951aa33507cd6744bda568f9c97447a87a484640 100644 --- a/android/RNGL.iml +++ b/android/RNGL.iml @@ -65,14 +65,6 @@ - - - - - - - - @@ -81,6 +73,14 @@ + + + + + + + + @@ -116,8 +116,8 @@ - + diff --git a/example/android/app/app.iml b/example/android/app/app.iml index 0edbe2a50b17650a854d3ca5ce07702d768b075e..c72bb6d5c71e628d84ab097e18c86058a0063dae 100644 --- a/example/android/app/app.iml +++ b/example/android/app/app.iml @@ -88,14 +88,14 @@ - - - - - - - - + + + + + + + + @@ -105,7 +105,6 @@ - @@ -118,26 +117,26 @@ + - - - + + + + + - - + - - - + + - - + diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 99e1c9b1916875138beaa214677633c3f305a4c1..eb6d6206128eba6a24709a475080ea31490e2100 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -4,6 +4,7 @@ getPackages() { - return Arrays.asList( - new MainReactPackage(), - new RNGLPackage(), - new RNFSPackage(), - new ReactMaterialKitPackage() - ); - } } diff --git a/example/android/app/src/main/java/com/example/MainApplication.java b/example/android/app/src/main/java/com/example/MainApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..f72a0fb8a2e14aa5ec6f7c58c824063cdffe508c --- /dev/null +++ b/example/android/app/src/main/java/com/example/MainApplication.java @@ -0,0 +1,41 @@ +package com.example; + +import android.app.Application; +import android.util.Log; + +import com.facebook.react.ReactApplication; +import com.facebook.react.ReactInstanceManager; +import com.facebook.react.ReactNativeHost; +import com.facebook.react.ReactPackage; +import com.facebook.react.shell.MainReactPackage; +import com.github.xinthink.rnmk.ReactMaterialKitPackage; +import com.projectseptember.RNGL.RNGLPackage; +import com.rnfs.RNFSPackage; + +import java.util.Arrays; +import java.util.List; + +public class MainApplication extends Application implements ReactApplication { + + private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) { + @Override + protected boolean getUseDeveloperSupport() { + return BuildConfig.DEBUG; + } + + @Override + protected List getPackages() { + return Arrays.asList( + new MainReactPackage(), + new RNGLPackage(), + new RNFSPackage(), + new ReactMaterialKitPackage() + ); + } + }; + + @Override + public ReactNativeHost getReactNativeHost() { + return mReactNativeHost; + } +} \ No newline at end of file diff --git a/example/android/build.gradle b/example/android/build.gradle index adc2df71dfb5ce0214854352f81e0dd147f6d399..421e13f2fbaee093a4abbeecf5b01b4b6e0fee8c 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 7ce224952c8c9bd626357bdee64dda2b12713912..8b4f6b4cb92dceae4107a35598f2d414282f648a 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jun 13 21:59:23 CEST 2016 +#Thu Aug 25 18:58:06 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/example/index.ios.js b/example/index.ios.js index dcd35ba70cd79c4b188692cacac42ecac7f5d241..85d5f7e9d041fdadccb40f8a66b9890ec3e5c4d9 100644 --- a/example/index.ios.js +++ b/example/index.ios.js @@ -1,4 +1,4 @@ -import { AppRegistry, StatusBarIOS } from "react-native"; +import { AppRegistry, StatusBar } from "react-native"; import example from "./src"; -StatusBarIOS.setHidden(true); +StatusBar.setHidden(true); AppRegistry.registerComponent("example", () => example); diff --git a/example/package.json b/example/package.json index c0966635d7f33d199ac0d3408357112553d23cf2..ed2bbc701bd456f1ef40c78352606ae8eee67dd1 100644 --- a/example/package.json +++ b/example/package.json @@ -11,11 +11,10 @@ "gl-react-blur": "^1.3.0", "gl-react-native": "file:..", "glsl-transitions": "^2016.2.15", - "react": "^15.1.0", - "react-native": "^0.28.0", - "react-native-fs": "^1.4.0", + "react": "15.2.0", + "react-native": "0.29.2", + "react-native-fs": "1.5.1", "react-native-material-kit": "PyYoshi/react-native-material-kit#rn-0.25.1", - "react-transform-hmr": "^1.0.2", "seedrandom": "gre/seedrandom#released" } }