Commit 96baa241 authored by Gullit Miranda's avatar Gullit Miranda

Merge remote-tracking branch 'upstream/master'

* upstream/master:
  2.35.0-rc.0
  prepare for .35-rc.0
  Add new param for partialLoadBlock in imageloader
parents 0f64a63f 0108785f
**[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) **[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)
# <img width="32" alt="icon" src="https://cloud.githubusercontent.com/assets/211411/9813786/eacfcc24-5888-11e5-8f9b-5a907a2cbb21.png"> gl-react-native ![](https://img.shields.io/badge/react--native-%200.34.x-05F561.svg) ![](https://img.shields.io/badge/gl--react-%202.2.x-05F561.svg) # <img width="32" alt="icon" src="https://cloud.githubusercontent.com/assets/211411/9813786/eacfcc24-5888-11e5-8f9b-5a907a2cbb21.png"> gl-react-native ![](https://img.shields.io/badge/react--native-%200.35.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. OpenGL bindings for React Native to implement complex effects over images and components, in the descriptive VDOM paradigm.
......
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = "RNGL" s.name = "RNGL"
s.version = "2.34.0" s.version = "2.35.0-rc.0"
s.author = "Project September" s.author = "Project September"
s.summary = "OpenGL bindings for React Native to implement complex effects over images and components" s.summary = "OpenGL bindings for React Native to implement complex effects over images and components"
s.homepage = "https://github.com/ProjectSeptemberInc/gl-react-native" s.homepage = "https://github.com/ProjectSeptemberInc/gl-react-native"
s.platform = :ios, "8.0" s.platform = :ios, "8.0"
s.source = { :git => "https://github.com/ProjectSeptemberInc/gl-react-native.git", :tag => "v2.34.0" } s.source = { :git => "https://github.com/ProjectSeptemberInc/gl-react-native.git", :tag => "v2.35.0-rc.0" }
s.source_files = "ios/*.{h,m}" s.source_files = "ios/*.{h,m}"
s.license = "MIT" s.license = "MIT"
......
...@@ -84,7 +84,6 @@ ...@@ -84,7 +84,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
......
...@@ -84,7 +84,6 @@ ...@@ -84,7 +84,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
...@@ -96,7 +95,7 @@ ...@@ -96,7 +95,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/0.11.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/0.11.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp3/0.11.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp3/0.11.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.11.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.11.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.34.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.35.0-rc.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.soloader/soloader/0.1.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.soloader/soloader/0.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
...@@ -123,6 +122,7 @@ ...@@ -123,6 +122,7 @@
<orderEntry type="library" exported="" name="okio-1.9.0" level="project" /> <orderEntry type="library" exported="" name="okio-1.9.0" level="project" />
<orderEntry type="library" exported="" name="imagepipeline-0.11.0" level="project" /> <orderEntry type="library" exported="" name="imagepipeline-0.11.0" level="project" />
<orderEntry type="library" exported="" name="library-2.4.0" level="project" /> <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" name="react-native-0.35.0-rc.0" level="project" />
<orderEntry type="library" exported="" name="imagepipeline-base-0.11.0" level="project" /> <orderEntry type="library" exported="" name="imagepipeline-base-0.11.0" level="project" />
<orderEntry type="library" exported="" name="fresco-0.11.0" level="project" /> <orderEntry type="library" exported="" name="fresco-0.11.0" level="project" />
<orderEntry type="library" exported="" name="drawee-0.11.0" level="project" /> <orderEntry type="library" exported="" name="drawee-0.11.0" level="project" />
...@@ -137,7 +137,6 @@ ...@@ -137,7 +137,6 @@
<orderEntry type="library" exported="" name="android-jsc-r174650" level="project" /> <orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
<orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" /> <orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.2.1" level="project" /> <orderEntry type="library" exported="" name="support-v4-23.2.1" level="project" />
<orderEntry type="library" exported="" name="react-native-0.34.0" level="project" />
<orderEntry type="library" exported="" name="imagepipeline-okhttp3-0.11.0" level="project" /> <orderEntry type="library" exported="" name="imagepipeline-okhttp3-0.11.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.2.1" level="project" /> <orderEntry type="library" exported="" name="support-annotations-23.2.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" /> <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
"gl-react-blur": "^1.3.0", "gl-react-blur": "^1.3.0",
"gl-react-native": "file:..", "gl-react-native": "file:..",
"glsl-transitions": "^2016.2.15", "glsl-transitions": "^2016.2.15",
"react": "15.3.1", "react": "15.3.2",
"react-native": "0.34.0", "react-native": "0.35.0-rc.0",
"react-native-fs": "1.5.1", "react-native-fs": "1.5.1",
"react-native-material-kit": "PyYoshi/react-native-material-kit#rn-0.25.1", "react-native-material-kit": "PyYoshi/react-native-material-kit#rn-0.25.1",
"seedrandom": "gre/seedrandom#released" "seedrandom": "gre/seedrandom#released"
......
...@@ -86,6 +86,7 @@ RCT_NOT_IMPLEMENTED(-init) ...@@ -86,6 +86,7 @@ RCT_NOT_IMPLEMENTED(-init)
clipped:YES clipped:YES
resizeMode:RCTResizeModeStretch resizeMode:RCTResizeModeStretch
progressBlock:nil progressBlock:nil
partialLoadBlock:nil
completionBlock:^(NSError *error, UIImage *loadedImage) { completionBlock:^(NSError *error, UIImage *loadedImage) {
GLImage *strongSelf = weakSelf; GLImage *strongSelf = weakSelf;
void (^setImageBlock)(UIImage *) = ^(UIImage *image) { void (^setImageBlock)(UIImage *) = ^(UIImage *image) {
......
{ {
"name": "gl-react-native", "name": "gl-react-native",
"version": "2.34.0", "version": "2.35.0-rc.0",
"description": "OpenGL bindings for react-native to implement complex effects over images and components, in the descriptive VDOM paradigm", "description": "OpenGL bindings for react-native to implement complex effects over images and components, in the descriptive VDOM paradigm",
"repository": { "repository": {
"type": "git", "type": "git",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment