From a1e341e1a5eec0ac0f7a91849bb3260daa899ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Wed, 2 Mar 2016 10:07:59 -0500 Subject: [PATCH] maintenance upgrade to RN 0.21 --- README.md | 2 +- RNGL.podspec | 2 +- android/RNGL.iml | 3 ++- android/build.gradle | 2 +- example/.flowconfig | 8 ++++---- example/android/app/app.iml | 4 ++-- example/android/app/build.gradle | 12 +++++++----- example/android/app/proguard-rules.pro | 4 ++-- example/android/app/react.gradle | 19 ++++++++++--------- example/android/build.gradle | 4 ++++ example/package.json | 2 +- package.json | 2 +- 12 files changed, 36 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index cf2688f..e15bcc9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ **[Gitbook documentation](http://projectseptemberinc.gitbooks.io/gl-react/content/) / [Github](https://github.com/ProjectSeptemberInc/gl-react-native/) / [gl-react](https://github.com/ProjectSeptemberInc/gl-react/)** / [#gl-react on reactiflux](https://discordapp.com/channels/102860784329052160/106102146109325312) -# icon gl-react-native ![](https://img.shields.io/badge/react--native-%200.20.x-05F561.svg) ![](https://img.shields.io/badge/gl--react-%202.2.x-05F561.svg) +# icon gl-react-native ![](https://img.shields.io/badge/react--native-%200.21.x-05F561.svg) ![](https://img.shields.io/badge/gl--react-%202.2.x-05F561.svg) OpenGL bindings for React Native to implement complex effects over images and components, in the descriptive VDOM paradigm. diff --git a/RNGL.podspec b/RNGL.podspec index ec3fd49..c534d74 100644 --- a/RNGL.podspec +++ b/RNGL.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "RNGL" - s.version = "2.20.2" + s.version = "2.21.0" s.homepage = "https://github.com/ProjectSeptemberInc/gl-react-native" s.platform = :ios, "8.0" s.source = { :git => "https://github.com/ProjectSeptemberInc/gl-react-native.git" } diff --git a/android/RNGL.iml b/android/RNGL.iml index f7935fe..56c669c 100644 --- a/android/RNGL.iml +++ b/android/RNGL.iml @@ -70,6 +70,7 @@ + @@ -85,8 +86,8 @@ - + diff --git a/android/build.gradle b/android/build.gradle index b30cdbc..e8ea6b2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -30,5 +30,5 @@ repositories { } dependencies { - compile 'com.facebook.react:react-native:0.20.+' + compile "com.facebook.react:react-native:+" // From node_modules } diff --git a/example/.flowconfig b/example/.flowconfig index 245c23a..c3edaf9 100644 --- a/example/.flowconfig +++ b/example/.flowconfig @@ -51,15 +51,15 @@ module.system=haste munge_underscores=true module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub' -module.name_mapper='^[./a-zA-Z0-9$_-]+\.png$' -> 'RelativeImageStub' +module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\)$' -> 'RelativeImageStub' suppress_type=$FlowIssue suppress_type=$FlowFixMe suppress_type=$FixMe -suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-0]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) -suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-0]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+ +suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-1]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) +suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-1]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy [version] -0.20.1 +0.21.0 diff --git a/example/android/app/app.iml b/example/android/app/app.iml index d5e5c37..f4da3a3 100644 --- a/example/android/app/app.iml +++ b/example/android/app/app.iml @@ -77,7 +77,7 @@ - + @@ -109,7 +109,7 @@ - + diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index cd8bb85..21d9954 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,9 @@ import com.android.build.OutputFile * * // whether to bundle JS and assets in another build variant (if configured). * // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants - * // The configuration property is in the format 'bundleIn${productFlavor}${buildType}' + * // The configuration property can be in the following formats + * // 'bundleIn${productFlavor}${buildType}' + * // 'bundleIn${buildType}' * // bundleInFreeDebug: true, * // bundleInPaidRelease: true, * // bundleInBeta: true, @@ -72,7 +74,7 @@ def enableSeparateBuildPerCPUArchitecture = false /** * Run Proguard to shrink the Java bytecode in release builds. */ -def enableProguardInReleaseBuilds = true +def enableProguardInReleaseBuilds = false android { compileSdkVersion 23 @@ -90,9 +92,9 @@ android { } splits { abi { - enable enableSeparateBuildPerCPUArchitecture - universalApk false // Also generate an universal APK reset() + enable enableSeparateBuildPerCPUArchitecture + universalApk false // If true, also generate a universal APK include "armeabi-v7a", "x86" } } @@ -120,7 +122,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.20.+" + compile "com.facebook.react:react-native:+" // From node_modules compile project(":RNMaterialKit") compile project(":RNGL") diff --git a/example/android/app/proguard-rules.pro b/example/android/app/proguard-rules.pro index 3584026..7d72e46 100644 --- a/example/android/app/proguard-rules.pro +++ b/example/android/app/proguard-rules.pro @@ -42,8 +42,8 @@ -keep class * extends com.facebook.react.bridge.NativeModule { *; } -keepclassmembers,includedescriptorclasses class * { native ; } -keepclassmembers class * { @com.facebook.react.uimanager.UIProp ; } --keepclassmembers class * { @com.facebook.react.uimanager.ReactProp ; } --keepclassmembers class * { @com.facebook.react.uimanager.ReactPropGroup ; } +-keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactProp ; } +-keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactPropGroup ; } -dontwarn com.facebook.react.** diff --git a/example/android/app/react.gradle b/example/android/app/react.gradle index 4b43bf9..11a4f8b 100644 --- a/example/android/app/react.gradle +++ b/example/android/app/react.gradle @@ -30,21 +30,20 @@ gradle.projectsEvaluated { productFlavors.each { productFlavorName -> buildTypes.each { buildTypeName -> - // Create variant and source names - def sourceName = "${buildTypeName}" - def targetName = "${sourceName.capitalize()}" - if (productFlavorName) { - sourceName = "${productFlavorName}${targetName}" - } + // Create variant and target names + def targetName = "${productFlavorName.capitalize()}${buildTypeName.capitalize()}" + def targetPath = productFlavorName ? + "${productFlavorName}/${buildTypeName}" : + "${buildTypeName}" // React js bundle directories def jsBundleDirConfigName = "jsBundleDir${targetName}" def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?: - file("$buildDir/intermediates/assets/${sourceName}") + file("$buildDir/intermediates/assets/${targetPath}") def resourcesDirConfigName = "jsBundleDir${targetName}" def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?: - file("$buildDir/intermediates/res/merged/${sourceName}") + file("$buildDir/intermediates/res/merged/${targetPath}") def jsBundleFile = file("$jsBundleDir/$bundleAssetName") // Bundle task name for variant @@ -80,7 +79,9 @@ gradle.projectsEvaluated { "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir } - enabled config."bundleIn${targetName}" ?: targetName.toLowerCase().contains("release") + enabled config."bundleIn${targetName}" || + config."bundleIn${buildTypeName.capitalize()}" ?: + targetName.toLowerCase().contains("release") } // Hook bundle${productFlavor}${buildType}JsAndAssets into the android build process diff --git a/example/android/build.gradle b/example/android/build.gradle index ccdfc4e..403a007 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -16,5 +16,9 @@ allprojects { repositories { mavenLocal() jcenter() + maven { + // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm + url "$projectDir/../../node_modules/react-native/android" + } } } diff --git a/example/package.json b/example/package.json index 5293927..9849cf2 100644 --- a/example/package.json +++ b/example/package.json @@ -13,7 +13,7 @@ "gl-react-native": "file:..", "glsl-transitions": "^2016.2.15", "react": "^0.14.7", - "react-native": "^0.20.0", + "react-native": "^0.21.0", "react-native-fs": "^1.2.0", "react-native-material-kit": "^0.3.0", "react-transform-hmr": "^1.0.2", diff --git a/package.json b/package.json index 4c749e2..2048a3a 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "author": "Project September ", "license": "MIT", "peerDependencies": { - "react-native": "^0.20.0", + "react-native": "^0.21.0", "gl-react": "^2.2.0" }, "dependencies": { -- 2.26.2