From e7f56f1422263ed03708833e030889be11925ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Thu, 25 Aug 2016 19:28:40 +0200 Subject: [PATCH] update example to RN 0.29 --- android/RNGL.iml | 18 ++++---- example/android/app/app.iml | 37 ++++++++--------- .../android/app/src/main/AndroidManifest.xml | 1 + .../main/java/com/example/MainActivity.java | 14 ------- .../java/com/example/MainApplication.java | 41 +++++++++++++++++++ example/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- example/index.ios.js | 4 +- example/package.json | 7 ++-- 9 files changed, 77 insertions(+), 51 deletions(-) create mode 100644 example/android/app/src/main/java/com/example/MainApplication.java diff --git a/android/RNGL.iml b/android/RNGL.iml index fc2aab2..951aa33 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 0edbe2a..c72bb6d 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 99e1c9b..eb6d620 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 0000000..f72a0fb --- /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 adc2df7..421e13f 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 7ce2249..8b4f6b4 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 dcd35ba..85d5f7e 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 c096663..ed2bbc7 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" } } -- 2.26.2