From f9021ce7296e4cfd68a61aac28d2387e8347bcd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Sat, 5 Dec 2015 15:35:29 +0100 Subject: [PATCH] update examples --- Examples/AdvancedEffects/.flowconfig | 30 +++++++--- Examples/AdvancedEffects/android/app/app.iml | 35 ++++++----- .../AdvancedEffects/android/app/build.gradle | 5 +- .../AdvancedEffects/android/app/react.gradle | 16 ++++- .../com/advancedeffects/MainActivity.java | 5 +- Examples/AdvancedEffects/android/build.gradle | 3 + .../AdvancedEffects/android/settings.gradle | 4 +- .../AdvancedEffects.xcodeproj/project.pbxproj | 24 ++++---- .../ios/AdvancedEffects/AppDelegate.m | 2 +- .../AdvancedEffectsTests.m | 2 +- Examples/AdvancedEffects/package.json | 4 +- Examples/AdvancedEffects/src/Slideshow.js | 4 +- Examples/Simple/.flowconfig | 30 +++++++--- Examples/Simple/android/app/app.iml | 35 ++++++----- Examples/Simple/android/app/build.gradle | 7 ++- Examples/Simple/android/app/react.gradle | 16 ++++- .../main/java/com/simple/MainActivity.java | 3 +- Examples/Simple/android/build.gradle | 3 + Examples/Simple/android/settings.gradle | 8 +-- .../ios/Simple.xcodeproj/project.pbxproj | 60 +++++++++---------- Examples/Simple/ios/Simple/AppDelegate.m | 2 +- Examples/Simple/ios/SimpleTests/SimpleTests.m | 2 +- Examples/Simple/package.json | 2 +- Examples/Tests/.flowconfig | 24 ++++++-- Examples/Tests/android/app/app.iml | 35 ++++++----- Examples/Tests/android/app/build.gradle | 5 +- Examples/Tests/android/app/react.gradle | 16 ++++- .../src/main/java/com/tests/MainActivity.java | 2 +- Examples/Tests/android/build.gradle | 3 + Examples/Tests/android/settings.gradle | 4 +- .../Tests/iOS/Tests.xcodeproj/project.pbxproj | 24 ++++---- Examples/Tests/ios/TestsTests/TestsTests.m | 2 +- Examples/Tests/package.json | 5 +- android/rngl.iml | 10 +++- 34 files changed, 264 insertions(+), 168 deletions(-) diff --git a/Examples/AdvancedEffects/.flowconfig b/Examples/AdvancedEffects/.flowconfig index 05cad20..8eadd33 100644 --- a/Examples/AdvancedEffects/.flowconfig +++ b/Examples/AdvancedEffects/.flowconfig @@ -7,12 +7,24 @@ # Some modules have their own node_modules with overlap .*/node_modules/node-haste/.* -# Ignore react-tools where there are overlaps, but don't ignore anything that -# react-native relies on -.*/node_modules/react-tools/src/React.js -.*/node_modules/react-tools/src/renderers/shared/event/EventPropagators.js -.*/node_modules/react-tools/src/renderers/shared/event/eventPlugins/ResponderEventPlugin.js -.*/node_modules/react-tools/src/shared/vendor/core/ExecutionEnvironment.js +# Ugh +.*/node_modules/babel.* +.*/node_modules/babylon.* +.*/node_modules/invariant.* + +# Ignore react and fbjs where there are overlaps, but don't ignore +# anything that react-native relies on +.*/node_modules/fbjs-haste/.*/__tests__/.* +.*/node_modules/fbjs-haste/__forks__/Map.js +.*/node_modules/fbjs-haste/__forks__/Promise.js +.*/node_modules/fbjs-haste/__forks__/fetch.js +.*/node_modules/fbjs-haste/core/ExecutionEnvironment.js +.*/node_modules/fbjs-haste/core/isEmpty.js +.*/node_modules/fbjs-haste/crypto/crc32.js +.*/node_modules/fbjs-haste/stubs/ErrorUtils.js +.*/node_modules/react-haste/React.js +.*/node_modules/react-haste/renderers/dom/ReactDOM.js +.*/node_modules/react-haste/renderers/shared/event/eventPlugins/ResponderEventPlugin.js # Ignore commoner tests .*/node_modules/commoner/test/.* @@ -43,9 +55,9 @@ suppress_type=$FlowIssue suppress_type=$FlowFixMe suppress_type=$FixMe -suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-7]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) -suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-7]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+ +suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-8]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) +suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-8]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy [version] -0.17.0 +0.18.1 diff --git a/Examples/AdvancedEffects/android/app/app.iml b/Examples/AdvancedEffects/android/app/app.iml index 1b995bc..236cbf3 100644 --- a/Examples/AdvancedEffects/android/app/app.iml +++ b/Examples/AdvancedEffects/android/app/app.iml @@ -73,12 +73,12 @@ - - - - - - + + + + + + @@ -92,24 +92,27 @@ - + - + + + + - - + + - + - - + + + - + - - + \ No newline at end of file diff --git a/Examples/AdvancedEffects/android/app/build.gradle b/Examples/AdvancedEffects/android/app/build.gradle index 850a7c5..30541b8 100644 --- a/Examples/AdvancedEffects/android/app/build.gradle +++ b/Examples/AdvancedEffects/android/app/build.gradle @@ -74,6 +74,7 @@ android { dependencies { compile fileTree(dir: "libs", include: ["*.jar"]) compile "com.android.support:appcompat-v7:23.0.1" - compile "com.facebook.react:react-native:0.14.+" - compile project(':rngl') + compile "com.facebook.react:react-native:0.16.+" + + compile project(':RNGL') } diff --git a/Examples/AdvancedEffects/android/app/react.gradle b/Examples/AdvancedEffects/android/app/react.gradle index dc18bb9..1e08b00 100644 --- a/Examples/AdvancedEffects/android/app/react.gradle +++ b/Examples/AdvancedEffects/android/app/react.gradle @@ -1,3 +1,5 @@ +import org.apache.tools.ant.taskdefs.condition.Os + def config = project.hasProperty("react") ? project.react : []; def bundleAssetName = config.bundleAssetName ?: "index.android.bundle" @@ -36,8 +38,13 @@ task bundleDebugJsAndAssets(type: Exec) { // set up the call to the react-native cli workingDir reactRoot - commandLine "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file", + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + commandLine "cmd", "/c", "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file", + entryFile, "--bundle-output", jsBundleFileDebug, "--assets-dest", resourcesDirDebug + } else { + commandLine "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file", entryFile, "--bundle-output", jsBundleFileDebug, "--assets-dest", resourcesDirDebug + } enabled config.bundleInDebug ?: false } @@ -56,8 +63,13 @@ task bundleReleaseJsAndAssets(type: Exec) { // set up the call to the react-native cli workingDir reactRoot - commandLine "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file", + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + commandLine "cmd","/c", "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file", entryFile, "--bundle-output", jsBundleFileRelease, "--assets-dest", resourcesDirRelease + } else { + commandLine "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file", + entryFile, "--bundle-output", jsBundleFileRelease, "--assets-dest", resourcesDirRelease + } enabled config.bundleInRelease ?: true } diff --git a/Examples/AdvancedEffects/android/app/src/main/java/com/advancedeffects/MainActivity.java b/Examples/AdvancedEffects/android/app/src/main/java/com/advancedeffects/MainActivity.java index db34c47..733e287 100644 --- a/Examples/AdvancedEffects/android/app/src/main/java/com/advancedeffects/MainActivity.java +++ b/Examples/AdvancedEffects/android/app/src/main/java/com/advancedeffects/MainActivity.java @@ -9,7 +9,6 @@ import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactRootView; import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; import com.facebook.react.shell.MainReactPackage; -import com.facebook.soloader.SoLoader; import com.projectseptember.RNGL.RNGLPackage; public class MainActivity extends Activity implements DefaultHardwareBackBtnHandler { @@ -26,8 +25,8 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand .setApplication(getApplication()) .setBundleAssetName("index.android.bundle") .setJSMainModuleName("index.android") - .addPackage(new RNGLPackage()) .addPackage(new MainReactPackage()) + .addPackage(new RNGLPackage()) .setUseDeveloperSupport(BuildConfig.DEBUG) .setInitialLifecycleState(LifecycleState.RESUMED) .build(); @@ -74,7 +73,7 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand super.onResume(); if (mReactInstanceManager != null) { - mReactInstanceManager.onResume(this); + mReactInstanceManager.onResume(this, this); } } } diff --git a/Examples/AdvancedEffects/android/build.gradle b/Examples/AdvancedEffects/android/build.gradle index ccdfc4e..bdb0fcc 100644 --- a/Examples/AdvancedEffects/android/build.gradle +++ b/Examples/AdvancedEffects/android/build.gradle @@ -16,5 +16,8 @@ allprojects { repositories { mavenLocal() jcenter() + jcenter { + url "http://dl.bintray.com/mkonicek/maven" + } } } diff --git a/Examples/AdvancedEffects/android/settings.gradle b/Examples/AdvancedEffects/android/settings.gradle index 310c30d..01166d4 100644 --- a/Examples/AdvancedEffects/android/settings.gradle +++ b/Examples/AdvancedEffects/android/settings.gradle @@ -2,5 +2,5 @@ rootProject.name = 'AdvancedEffects' include ':app' -include ':rngl', ':app' -project(':rngl').projectDir = new File(rootProject.projectDir, '../../../android') \ No newline at end of file +include ':RNGL' +project(':RNGL').projectDir = file('../../../android') \ No newline at end of file diff --git a/Examples/AdvancedEffects/ios/AdvancedEffects.xcodeproj/project.pbxproj b/Examples/AdvancedEffects/ios/AdvancedEffects.xcodeproj/project.pbxproj index 26fbef0..67137fa 100644 --- a/Examples/AdvancedEffects/ios/AdvancedEffects.xcodeproj/project.pbxproj +++ b/Examples/AdvancedEffects/ios/AdvancedEffects.xcodeproj/project.pbxproj @@ -21,7 +21,7 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; - 3425F3031C03B5EE00139EC9 /* libRNGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34582C661BEFE6BA0093A350 /* libRNGL.a */; }; + 34CCE0351C13208200427A3E /* libRNGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34CCE0341C13206E00427A3E /* libRNGL.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; /* End PBXBuildFile section */ @@ -89,9 +89,9 @@ remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; remoteInfo = React; }; - 34582C651BEFE6BA0093A350 /* PBXContainerItemProxy */ = { + 34CCE0331C13206E00427A3E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 34582C571BEFE6BA0093A350 /* RNGL.xcodeproj */; + containerPortal = 34CCE0251C13206E00427A3E /* RNGL.xcodeproj */; proxyType = 2; remoteGlobalIDString = 4107012F1ACB723B00C6AA39; remoteInfo = RNGL; @@ -132,7 +132,7 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = AdvancedEffects/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = AdvancedEffects/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; - 34582C571BEFE6BA0093A350 /* RNGL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNGL.xcodeproj; path = "../node_modules/gl-react-native/ios/RNGL.xcodeproj"; sourceTree = ""; }; + 34CCE0251C13206E00427A3E /* RNGL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNGL.xcodeproj; path = "../node_modules/gl-react-native/ios/RNGL.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -149,7 +149,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3425F3031C03B5EE00139EC9 /* libRNGL.a in Frameworks */, + 34CCE0351C13208200427A3E /* libRNGL.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, @@ -261,10 +261,10 @@ name = Products; sourceTree = ""; }; - 34582C581BEFE6BA0093A350 /* Products */ = { + 34CCE0261C13206E00427A3E /* Products */ = { isa = PBXGroup; children = ( - 34582C661BEFE6BA0093A350 /* libRNGL.a */, + 34CCE0341C13206E00427A3E /* libRNGL.a */, ); name = Products; sourceTree = ""; @@ -280,7 +280,7 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( - 34582C571BEFE6BA0093A350 /* RNGL.xcodeproj */, + 34CCE0251C13206E00427A3E /* RNGL.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */, @@ -431,8 +431,8 @@ ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, { - ProductGroup = 34582C581BEFE6BA0093A350 /* Products */; - ProjectRef = 34582C571BEFE6BA0093A350 /* RNGL.xcodeproj */; + ProductGroup = 34CCE0261C13206E00427A3E /* Products */; + ProjectRef = 34CCE0251C13206E00427A3E /* RNGL.xcodeproj */; }, ); projectRoot = ""; @@ -500,11 +500,11 @@ remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 34582C661BEFE6BA0093A350 /* libRNGL.a */ = { + 34CCE0341C13206E00427A3E /* libRNGL.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libRNGL.a; - remoteRef = 34582C651BEFE6BA0093A350 /* PBXContainerItemProxy */; + remoteRef = 34CCE0331C13206E00427A3E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = { diff --git a/Examples/AdvancedEffects/ios/AdvancedEffects/AppDelegate.m b/Examples/AdvancedEffects/ios/AdvancedEffects/AppDelegate.m index 3c75cc8..7b781db 100644 --- a/Examples/AdvancedEffects/ios/AdvancedEffects/AppDelegate.m +++ b/Examples/AdvancedEffects/ios/AdvancedEffects/AppDelegate.m @@ -47,7 +47,7 @@ launchOptions:launchOptions]; self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; - UIViewController *rootViewController = [[UIViewController alloc] init]; + UIViewController *rootViewController = [UIViewController new]; rootViewController.view = rootView; self.window.rootViewController = rootViewController; [self.window makeKeyAndVisible]; diff --git a/Examples/AdvancedEffects/ios/AdvancedEffectsTests/AdvancedEffectsTests.m b/Examples/AdvancedEffects/ios/AdvancedEffectsTests/AdvancedEffectsTests.m index 8ce7351..ee20246 100644 --- a/Examples/AdvancedEffects/ios/AdvancedEffectsTests/AdvancedEffectsTests.m +++ b/Examples/AdvancedEffects/ios/AdvancedEffectsTests/AdvancedEffectsTests.m @@ -42,7 +42,7 @@ BOOL foundElement = NO; __block NSString *redboxError = nil; - RCTSetLogFunction(^(RCTLogLevel level, NSString *fileName, NSNumber *lineNumber, NSString *message) { + RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) { if (level >= RCTLogLevelError) { redboxError = message; } diff --git a/Examples/AdvancedEffects/package.json b/Examples/AdvancedEffects/package.json index 1e69318..2b1454f 100644 --- a/Examples/AdvancedEffects/package.json +++ b/Examples/AdvancedEffects/package.json @@ -6,9 +6,9 @@ "start": "react-native start" }, "dependencies": { - "gl-react-native": "file:../..", "gl-react": "file:../../../gl-react", + "gl-react-native": "file:../..", "glsl-transitions": "^2015.11.8", - "react-native": "^0.14.2" + "react-native": "^0.16.0" } } diff --git a/Examples/AdvancedEffects/src/Slideshow.js b/Examples/AdvancedEffects/src/Slideshow.js index 5ed9223..20ca69c 100644 --- a/Examples/AdvancedEffects/src/Slideshow.js +++ b/Examples/AdvancedEffects/src/Slideshow.js @@ -34,13 +34,15 @@ class Slideshow extends React.Component { const transitionUniforms = this._uniforms; return - + diff --git a/Examples/Simple/.flowconfig b/Examples/Simple/.flowconfig index 05cad20..8eadd33 100644 --- a/Examples/Simple/.flowconfig +++ b/Examples/Simple/.flowconfig @@ -7,12 +7,24 @@ # Some modules have their own node_modules with overlap .*/node_modules/node-haste/.* -# Ignore react-tools where there are overlaps, but don't ignore anything that -# react-native relies on -.*/node_modules/react-tools/src/React.js -.*/node_modules/react-tools/src/renderers/shared/event/EventPropagators.js -.*/node_modules/react-tools/src/renderers/shared/event/eventPlugins/ResponderEventPlugin.js -.*/node_modules/react-tools/src/shared/vendor/core/ExecutionEnvironment.js +# Ugh +.*/node_modules/babel.* +.*/node_modules/babylon.* +.*/node_modules/invariant.* + +# Ignore react and fbjs where there are overlaps, but don't ignore +# anything that react-native relies on +.*/node_modules/fbjs-haste/.*/__tests__/.* +.*/node_modules/fbjs-haste/__forks__/Map.js +.*/node_modules/fbjs-haste/__forks__/Promise.js +.*/node_modules/fbjs-haste/__forks__/fetch.js +.*/node_modules/fbjs-haste/core/ExecutionEnvironment.js +.*/node_modules/fbjs-haste/core/isEmpty.js +.*/node_modules/fbjs-haste/crypto/crc32.js +.*/node_modules/fbjs-haste/stubs/ErrorUtils.js +.*/node_modules/react-haste/React.js +.*/node_modules/react-haste/renderers/dom/ReactDOM.js +.*/node_modules/react-haste/renderers/shared/event/eventPlugins/ResponderEventPlugin.js # Ignore commoner tests .*/node_modules/commoner/test/.* @@ -43,9 +55,9 @@ suppress_type=$FlowIssue suppress_type=$FlowFixMe suppress_type=$FixMe -suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-7]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) -suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-7]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+ +suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-8]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) +suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-8]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy [version] -0.17.0 +0.18.1 diff --git a/Examples/Simple/android/app/app.iml b/Examples/Simple/android/app/app.iml index 4b5659e..bacf17a 100644 --- a/Examples/Simple/android/app/app.iml +++ b/Examples/Simple/android/app/app.iml @@ -72,12 +72,12 @@ - - - - - - + + + + + + @@ -91,25 +91,28 @@ - + - + + + + - - + + - + - - + + + - + - - + \ No newline at end of file diff --git a/Examples/Simple/android/app/build.gradle b/Examples/Simple/android/app/build.gradle index ae3edeb..4bcd0ed 100644 --- a/Examples/Simple/android/app/build.gradle +++ b/Examples/Simple/android/app/build.gradle @@ -74,7 +74,8 @@ android { dependencies { compile fileTree(dir: "libs", include: ["*.jar"]) compile "com.android.support:appcompat-v7:23.0.1" - compile "com.facebook.react:react-native:0.14.+" - compile project(':rngl') - compile project(':RNMaterialKit') + compile "com.facebook.react:react-native:0.16.+" + + compile project(":RNMaterialKit") + compile project(":RNGL") } diff --git a/Examples/Simple/android/app/react.gradle b/Examples/Simple/android/app/react.gradle index dc18bb9..1e08b00 100644 --- a/Examples/Simple/android/app/react.gradle +++ b/Examples/Simple/android/app/react.gradle @@ -1,3 +1,5 @@ +import org.apache.tools.ant.taskdefs.condition.Os + def config = project.hasProperty("react") ? project.react : []; def bundleAssetName = config.bundleAssetName ?: "index.android.bundle" @@ -36,8 +38,13 @@ task bundleDebugJsAndAssets(type: Exec) { // set up the call to the react-native cli workingDir reactRoot - commandLine "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file", + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + commandLine "cmd", "/c", "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file", + entryFile, "--bundle-output", jsBundleFileDebug, "--assets-dest", resourcesDirDebug + } else { + commandLine "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file", entryFile, "--bundle-output", jsBundleFileDebug, "--assets-dest", resourcesDirDebug + } enabled config.bundleInDebug ?: false } @@ -56,8 +63,13 @@ task bundleReleaseJsAndAssets(type: Exec) { // set up the call to the react-native cli workingDir reactRoot - commandLine "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file", + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + commandLine "cmd","/c", "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file", entryFile, "--bundle-output", jsBundleFileRelease, "--assets-dest", resourcesDirRelease + } else { + commandLine "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file", + entryFile, "--bundle-output", jsBundleFileRelease, "--assets-dest", resourcesDirRelease + } enabled config.bundleInRelease ?: true } diff --git a/Examples/Simple/android/app/src/main/java/com/simple/MainActivity.java b/Examples/Simple/android/app/src/main/java/com/simple/MainActivity.java index 8c6aaea..1822c6c 100644 --- a/Examples/Simple/android/app/src/main/java/com/simple/MainActivity.java +++ b/Examples/Simple/android/app/src/main/java/com/simple/MainActivity.java @@ -9,7 +9,6 @@ import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactRootView; import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; import com.facebook.react.shell.MainReactPackage; -import com.facebook.soloader.SoLoader; import com.github.xinthink.rnmk.ReactMaterialKitPackage; import com.projectseptember.RNGL.RNGLPackage; @@ -76,7 +75,7 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand super.onResume(); if (mReactInstanceManager != null) { - mReactInstanceManager.onResume(this); + mReactInstanceManager.onResume(this, this); } } } diff --git a/Examples/Simple/android/build.gradle b/Examples/Simple/android/build.gradle index ccdfc4e..bdb0fcc 100644 --- a/Examples/Simple/android/build.gradle +++ b/Examples/Simple/android/build.gradle @@ -16,5 +16,8 @@ allprojects { repositories { mavenLocal() jcenter() + jcenter { + url "http://dl.bintray.com/mkonicek/maven" + } } } diff --git a/Examples/Simple/android/settings.gradle b/Examples/Simple/android/settings.gradle index 117a0b2..eac886a 100644 --- a/Examples/Simple/android/settings.gradle +++ b/Examples/Simple/android/settings.gradle @@ -2,8 +2,8 @@ rootProject.name = 'Simple' include ':app' -include ':rngl', ':app' -project(':rngl').projectDir = new File(rootProject.projectDir, '../../../android') - include ':RNMaterialKit' -project(':RNMaterialKit').projectDir = file('../node_modules/react-native-material-kit/android') \ No newline at end of file +project(':RNMaterialKit').projectDir = file('../node_modules/react-native-material-kit/android') + +include ':RNGL' +project(':RNGL').projectDir = file('../../../android') \ No newline at end of file diff --git a/Examples/Simple/ios/Simple.xcodeproj/project.pbxproj b/Examples/Simple/ios/Simple.xcodeproj/project.pbxproj index d5c945b..d0fc18e 100644 --- a/Examples/Simple/ios/Simple.xcodeproj/project.pbxproj +++ b/Examples/Simple/ios/Simple.xcodeproj/project.pbxproj @@ -21,8 +21,8 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; - 34BDBFE91C00AB2100A531CF /* libRCTMaterialKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 347A8B8B1C00771B00A29A61 /* libRCTMaterialKit.a */; }; - 34BDBFF51C00AB2400A531CF /* libRNGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 347A8B851C00770E00A29A61 /* libRNGL.a */; }; + 34607B601C132B22009203B1 /* libRCTMaterialKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34607B581C132B1C009203B1 /* libRCTMaterialKit.a */; }; + 3461EB4B1C132AEC0003E4A2 /* libRNGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3461EB4A1C132AD30003E4A2 /* libRNGL.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; /* End PBXBuildFile section */ @@ -90,19 +90,19 @@ remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; remoteInfo = React; }; - 347A8B841C00770E00A29A61 /* PBXContainerItemProxy */ = { + 34607B571C132B1C009203B1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 347A8B761C00770E00A29A61 /* RNGL.xcodeproj */; + containerPortal = 34607B4F1C132B1C009203B1 /* RCTMaterialKit.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 4107012F1ACB723B00C6AA39; - remoteInfo = RNGL; + remoteGlobalIDString = 8A1B8E771B22E4E300DB45C2; + remoteInfo = RCTMaterialKit; }; - 347A8B8A1C00771B00A29A61 /* PBXContainerItemProxy */ = { + 3461EB491C132AD30003E4A2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 347A8B861C00771B00A29A61 /* RCTMaterialKit.xcodeproj */; + containerPortal = 3461EB3B1C132AD30003E4A2 /* RNGL.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 8A1B8E771B22E4E300DB45C2; - remoteInfo = RCTMaterialKit; + remoteGlobalIDString = 4107012F1ACB723B00C6AA39; + remoteInfo = RNGL; }; 78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -140,8 +140,8 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Simple/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Simple/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; - 347A8B761C00770E00A29A61 /* RNGL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNGL.xcodeproj; path = "../node_modules/gl-react-native/ios/RNGL.xcodeproj"; sourceTree = ""; }; - 347A8B861C00771B00A29A61 /* RCTMaterialKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTMaterialKit.xcodeproj; path = "../node_modules/react-native-material-kit/iOS/RCTMaterialKit.xcodeproj"; sourceTree = ""; }; + 34607B4F1C132B1C009203B1 /* RCTMaterialKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTMaterialKit.xcodeproj; path = "../node_modules/react-native-material-kit/iOS/RCTMaterialKit.xcodeproj"; sourceTree = ""; }; + 3461EB3B1C132AD30003E4A2 /* RNGL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNGL.xcodeproj; path = "../node_modules/gl-react-native/ios/RNGL.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -158,8 +158,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 34BDBFF51C00AB2400A531CF /* libRNGL.a in Frameworks */, - 34BDBFE91C00AB2100A531CF /* libRCTMaterialKit.a in Frameworks */, + 34607B601C132B22009203B1 /* libRCTMaterialKit.a in Frameworks */, + 3461EB4B1C132AEC0003E4A2 /* libRNGL.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, @@ -271,18 +271,18 @@ name = Products; sourceTree = ""; }; - 347A8B771C00770E00A29A61 /* Products */ = { + 34607B501C132B1C009203B1 /* Products */ = { isa = PBXGroup; children = ( - 347A8B851C00770E00A29A61 /* libRNGL.a */, + 34607B581C132B1C009203B1 /* libRCTMaterialKit.a */, ); name = Products; sourceTree = ""; }; - 347A8B871C00771B00A29A61 /* Products */ = { + 3461EB3C1C132AD30003E4A2 /* Products */ = { isa = PBXGroup; children = ( - 347A8B8B1C00771B00A29A61 /* libRCTMaterialKit.a */, + 3461EB4A1C132AD30003E4A2 /* libRNGL.a */, ); name = Products; sourceTree = ""; @@ -298,8 +298,8 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( - 347A8B861C00771B00A29A61 /* RCTMaterialKit.xcodeproj */, - 347A8B761C00770E00A29A61 /* RNGL.xcodeproj */, + 34607B4F1C132B1C009203B1 /* RCTMaterialKit.xcodeproj */, + 3461EB3B1C132AD30003E4A2 /* RNGL.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */, @@ -426,8 +426,8 @@ ProjectRef = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */; }, { - ProductGroup = 347A8B871C00771B00A29A61 /* Products */; - ProjectRef = 347A8B861C00771B00A29A61 /* RCTMaterialKit.xcodeproj */; + ProductGroup = 34607B501C132B1C009203B1 /* Products */; + ProjectRef = 34607B4F1C132B1C009203B1 /* RCTMaterialKit.xcodeproj */; }, { ProductGroup = 00C302D41ABCB9D200DB3ED1 /* Products */; @@ -454,8 +454,8 @@ ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, { - ProductGroup = 347A8B771C00770E00A29A61 /* Products */; - ProjectRef = 347A8B761C00770E00A29A61 /* RNGL.xcodeproj */; + ProductGroup = 3461EB3C1C132AD30003E4A2 /* Products */; + ProjectRef = 3461EB3B1C132AD30003E4A2 /* RNGL.xcodeproj */; }, ); projectRoot = ""; @@ -523,18 +523,18 @@ remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 347A8B851C00770E00A29A61 /* libRNGL.a */ = { + 34607B581C132B1C009203B1 /* libRCTMaterialKit.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libRNGL.a; - remoteRef = 347A8B841C00770E00A29A61 /* PBXContainerItemProxy */; + path = libRCTMaterialKit.a; + remoteRef = 34607B571C132B1C009203B1 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 347A8B8B1C00771B00A29A61 /* libRCTMaterialKit.a */ = { + 3461EB4A1C132AD30003E4A2 /* libRNGL.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libRCTMaterialKit.a; - remoteRef = 347A8B8A1C00771B00A29A61 /* PBXContainerItemProxy */; + path = libRNGL.a; + remoteRef = 3461EB491C132AD30003E4A2 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = { diff --git a/Examples/Simple/ios/Simple/AppDelegate.m b/Examples/Simple/ios/Simple/AppDelegate.m index 87a358c..11563bb 100644 --- a/Examples/Simple/ios/Simple/AppDelegate.m +++ b/Examples/Simple/ios/Simple/AppDelegate.m @@ -47,7 +47,7 @@ launchOptions:launchOptions]; self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; - UIViewController *rootViewController = [[UIViewController alloc] init]; + UIViewController *rootViewController = [UIViewController new]; rootViewController.view = rootView; self.window.rootViewController = rootViewController; [self.window makeKeyAndVisible]; diff --git a/Examples/Simple/ios/SimpleTests/SimpleTests.m b/Examples/Simple/ios/SimpleTests/SimpleTests.m index 8b4746f..ef367ed 100644 --- a/Examples/Simple/ios/SimpleTests/SimpleTests.m +++ b/Examples/Simple/ios/SimpleTests/SimpleTests.m @@ -42,7 +42,7 @@ BOOL foundElement = NO; __block NSString *redboxError = nil; - RCTSetLogFunction(^(RCTLogLevel level, NSString *fileName, NSNumber *lineNumber, NSString *message) { + RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) { if (level >= RCTLogLevelError) { redboxError = message; } diff --git a/Examples/Simple/package.json b/Examples/Simple/package.json index a1b1043..bc7aac8 100644 --- a/Examples/Simple/package.json +++ b/Examples/Simple/package.json @@ -8,7 +8,7 @@ "dependencies": { "gl-react-native": "file:../..", "gl-react": "file:../../../gl-react", - "react-native": "^0.14.2", + "react-native": "^0.16.0", "react-native-material-kit": "^0.2.2" } } diff --git a/Examples/Tests/.flowconfig b/Examples/Tests/.flowconfig index caff849..8eadd33 100644 --- a/Examples/Tests/.flowconfig +++ b/Examples/Tests/.flowconfig @@ -7,12 +7,24 @@ # Some modules have their own node_modules with overlap .*/node_modules/node-haste/.* -# Ignore react-tools where there are overlaps, but don't ignore anything that -# react-native relies on -.*/node_modules/react-tools/src/React.js -.*/node_modules/react-tools/src/renderers/shared/event/EventPropagators.js -.*/node_modules/react-tools/src/renderers/shared/event/eventPlugins/ResponderEventPlugin.js -.*/node_modules/react-tools/src/shared/vendor/core/ExecutionEnvironment.js +# Ugh +.*/node_modules/babel.* +.*/node_modules/babylon.* +.*/node_modules/invariant.* + +# Ignore react and fbjs where there are overlaps, but don't ignore +# anything that react-native relies on +.*/node_modules/fbjs-haste/.*/__tests__/.* +.*/node_modules/fbjs-haste/__forks__/Map.js +.*/node_modules/fbjs-haste/__forks__/Promise.js +.*/node_modules/fbjs-haste/__forks__/fetch.js +.*/node_modules/fbjs-haste/core/ExecutionEnvironment.js +.*/node_modules/fbjs-haste/core/isEmpty.js +.*/node_modules/fbjs-haste/crypto/crc32.js +.*/node_modules/fbjs-haste/stubs/ErrorUtils.js +.*/node_modules/react-haste/React.js +.*/node_modules/react-haste/renderers/dom/ReactDOM.js +.*/node_modules/react-haste/renderers/shared/event/eventPlugins/ResponderEventPlugin.js # Ignore commoner tests .*/node_modules/commoner/test/.* diff --git a/Examples/Tests/android/app/app.iml b/Examples/Tests/android/app/app.iml index 16df1d2..521052c 100644 --- a/Examples/Tests/android/app/app.iml +++ b/Examples/Tests/android/app/app.iml @@ -72,12 +72,12 @@ - - - - - - + + + + + + @@ -91,24 +91,27 @@ - + - + + + + - + + - - + - - + + + - + - - + \ No newline at end of file diff --git a/Examples/Tests/android/app/build.gradle b/Examples/Tests/android/app/build.gradle index 24351ea..97b9dd8 100644 --- a/Examples/Tests/android/app/build.gradle +++ b/Examples/Tests/android/app/build.gradle @@ -74,6 +74,7 @@ android { dependencies { compile fileTree(dir: "libs", include: ["*.jar"]) compile "com.android.support:appcompat-v7:23.0.1" - compile "com.facebook.react:react-native:0.15.+" - compile project(':rngl') + compile "com.facebook.react:react-native:0.16.+" + + compile project(":RNGL") } diff --git a/Examples/Tests/android/app/react.gradle b/Examples/Tests/android/app/react.gradle index dc18bb9..1e08b00 100644 --- a/Examples/Tests/android/app/react.gradle +++ b/Examples/Tests/android/app/react.gradle @@ -1,3 +1,5 @@ +import org.apache.tools.ant.taskdefs.condition.Os + def config = project.hasProperty("react") ? project.react : []; def bundleAssetName = config.bundleAssetName ?: "index.android.bundle" @@ -36,8 +38,13 @@ task bundleDebugJsAndAssets(type: Exec) { // set up the call to the react-native cli workingDir reactRoot - commandLine "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file", + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + commandLine "cmd", "/c", "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file", + entryFile, "--bundle-output", jsBundleFileDebug, "--assets-dest", resourcesDirDebug + } else { + commandLine "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file", entryFile, "--bundle-output", jsBundleFileDebug, "--assets-dest", resourcesDirDebug + } enabled config.bundleInDebug ?: false } @@ -56,8 +63,13 @@ task bundleReleaseJsAndAssets(type: Exec) { // set up the call to the react-native cli workingDir reactRoot - commandLine "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file", + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + commandLine "cmd","/c", "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file", entryFile, "--bundle-output", jsBundleFileRelease, "--assets-dest", resourcesDirRelease + } else { + commandLine "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file", + entryFile, "--bundle-output", jsBundleFileRelease, "--assets-dest", resourcesDirRelease + } enabled config.bundleInRelease ?: true } diff --git a/Examples/Tests/android/app/src/main/java/com/tests/MainActivity.java b/Examples/Tests/android/app/src/main/java/com/tests/MainActivity.java index c943db5..e88f344 100644 --- a/Examples/Tests/android/app/src/main/java/com/tests/MainActivity.java +++ b/Examples/Tests/android/app/src/main/java/com/tests/MainActivity.java @@ -26,8 +26,8 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand .setApplication(getApplication()) .setBundleAssetName("index.android.bundle") .setJSMainModuleName("index.android") - .addPackage(new RNGLPackage()) .addPackage(new MainReactPackage()) + .addPackage(new RNGLPackage()) .setUseDeveloperSupport(BuildConfig.DEBUG) .setInitialLifecycleState(LifecycleState.RESUMED) .build(); diff --git a/Examples/Tests/android/build.gradle b/Examples/Tests/android/build.gradle index ccdfc4e..bdb0fcc 100644 --- a/Examples/Tests/android/build.gradle +++ b/Examples/Tests/android/build.gradle @@ -16,5 +16,8 @@ allprojects { repositories { mavenLocal() jcenter() + jcenter { + url "http://dl.bintray.com/mkonicek/maven" + } } } diff --git a/Examples/Tests/android/settings.gradle b/Examples/Tests/android/settings.gradle index a328c0b..6fc7423 100644 --- a/Examples/Tests/android/settings.gradle +++ b/Examples/Tests/android/settings.gradle @@ -2,5 +2,5 @@ rootProject.name = 'Tests' include ':app' -include ':rngl', ':app' -project(':rngl').projectDir = new File(rootProject.projectDir, '../../../android') \ No newline at end of file +include ':RNGL' +project(':RNGL').projectDir = file('../../../android') \ No newline at end of file diff --git a/Examples/Tests/iOS/Tests.xcodeproj/project.pbxproj b/Examples/Tests/iOS/Tests.xcodeproj/project.pbxproj index 5981482..021ccbc 100644 --- a/Examples/Tests/iOS/Tests.xcodeproj/project.pbxproj +++ b/Examples/Tests/iOS/Tests.xcodeproj/project.pbxproj @@ -21,7 +21,7 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; - 349265F01C066AAD00992528 /* libRNGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 349265EF1C066AA400992528 /* libRNGL.a */; }; + 3461EB301C132AA90003E4A2 /* libRNGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3461EB2F1C132A9F0003E4A2 /* libRNGL.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; /* End PBXBuildFile section */ @@ -89,9 +89,9 @@ remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; remoteInfo = React; }; - 349265EE1C066AA400992528 /* PBXContainerItemProxy */ = { + 3461EB2E1C132A9F0003E4A2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 349265E01C066AA400992528 /* RNGL.xcodeproj */; + containerPortal = 3461EB201C132A9F0003E4A2 /* RNGL.xcodeproj */; proxyType = 2; remoteGlobalIDString = 4107012F1ACB723B00C6AA39; remoteInfo = RNGL; @@ -132,7 +132,7 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Tests/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Tests/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; - 349265E01C066AA400992528 /* RNGL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNGL.xcodeproj; path = "../node_modules/gl-react-native/ios/RNGL.xcodeproj"; sourceTree = ""; }; + 3461EB201C132A9F0003E4A2 /* RNGL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNGL.xcodeproj; path = "../node_modules/gl-react-native/ios/RNGL.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -149,7 +149,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 349265F01C066AAD00992528 /* libRNGL.a in Frameworks */, + 3461EB301C132AA90003E4A2 /* libRNGL.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, @@ -261,10 +261,10 @@ name = Products; sourceTree = ""; }; - 349265E11C066AA400992528 /* Products */ = { + 3461EB211C132A9F0003E4A2 /* Products */ = { isa = PBXGroup; children = ( - 349265EF1C066AA400992528 /* libRNGL.a */, + 3461EB2F1C132A9F0003E4A2 /* libRNGL.a */, ); name = Products; sourceTree = ""; @@ -280,6 +280,7 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( + 3461EB201C132A9F0003E4A2 /* RNGL.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */, @@ -290,7 +291,6 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, - 349265E01C066AA400992528 /* RNGL.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -431,8 +431,8 @@ ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, { - ProductGroup = 349265E11C066AA400992528 /* Products */; - ProjectRef = 349265E01C066AA400992528 /* RNGL.xcodeproj */; + ProductGroup = 3461EB211C132A9F0003E4A2 /* Products */; + ProjectRef = 3461EB201C132A9F0003E4A2 /* RNGL.xcodeproj */; }, ); projectRoot = ""; @@ -500,11 +500,11 @@ remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 349265EF1C066AA400992528 /* libRNGL.a */ = { + 3461EB2F1C132A9F0003E4A2 /* libRNGL.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libRNGL.a; - remoteRef = 349265EE1C066AA400992528 /* PBXContainerItemProxy */; + remoteRef = 3461EB2E1C132A9F0003E4A2 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = { diff --git a/Examples/Tests/ios/TestsTests/TestsTests.m b/Examples/Tests/ios/TestsTests/TestsTests.m index b1b60bd..a14b657 100644 --- a/Examples/Tests/ios/TestsTests/TestsTests.m +++ b/Examples/Tests/ios/TestsTests/TestsTests.m @@ -42,7 +42,7 @@ BOOL foundElement = NO; __block NSString *redboxError = nil; - RCTSetLogFunction(^(RCTLogLevel level, NSString *fileName, NSNumber *lineNumber, NSString *message) { + RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) { if (level >= RCTLogLevelError) { redboxError = message; } diff --git a/Examples/Tests/package.json b/Examples/Tests/package.json index 7cd494b..59fcabd 100644 --- a/Examples/Tests/package.json +++ b/Examples/Tests/package.json @@ -8,9 +8,6 @@ "dependencies": { "gl-react-native": "file:../..", "gl-react": "file:../../../gl-react", - "react-native": "^0.14.2" - }, - "devDependencies": { - "react-native-cli": "^0.1.7" + "react-native": "^0.16.0" } } diff --git a/android/rngl.iml b/android/rngl.iml index 1654eb9..5e4ef6e 100644 --- a/android/rngl.iml +++ b/android/rngl.iml @@ -1,9 +1,9 @@ - + - @@ -70,6 +70,12 @@ + + + + + + -- 2.26.2