diff --git a/README.md b/README.md index b1da07509a4fe4ba16d1517618295c8b03066004..4c1a45b51f9a15ce34ebb988a6a63f5887c6482d 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.34.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.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. diff --git a/RNGL.podspec b/RNGL.podspec index f822106236974ca27d5a847ba1f653bf80d6c2c3..743349a493cb47ee3712f0886b8b0b42541b0d19 100644 --- a/RNGL.podspec +++ b/RNGL.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = "RNGL" - s.version = "2.34.0" + s.version = "2.35.0-rc.0" s.author = "Project September" 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.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.license = "MIT" diff --git a/android/RNGL.iml b/android/RNGL.iml index 7352ddb9f01880c49b5931514513d4a0a2327ef1..58662a6191d1fe5ecbf219fba42623a8bae3eb19 100644 --- a/android/RNGL.iml +++ b/android/RNGL.iml @@ -84,7 +84,6 @@ - diff --git a/example/android/app/app.iml b/example/android/app/app.iml index 79ebec5997c4647e6afcfd729911cfb36f749272..e53ede9741ce1ef42599f9b168b85f6eb10985f2 100644 --- a/example/android/app/app.iml +++ b/example/android/app/app.iml @@ -84,7 +84,6 @@ - @@ -96,7 +95,7 @@ - + @@ -123,6 +122,7 @@ + @@ -137,7 +137,6 @@ - diff --git a/example/package.json b/example/package.json index cce6c92fc0f50fbd3d25b01f9c3f85fa25a0bf94..5f0f5ca596cab8c5d49ed6755cf257514a9695f8 100644 --- a/example/package.json +++ b/example/package.json @@ -11,8 +11,8 @@ "gl-react-blur": "^1.3.0", "gl-react-native": "file:..", "glsl-transitions": "^2016.2.15", - "react": "15.3.1", - "react-native": "0.34.0", + "react": "15.3.2", + "react-native": "0.35.0-rc.0", "react-native-fs": "1.5.1", "react-native-material-kit": "PyYoshi/react-native-material-kit#rn-0.25.1", "seedrandom": "gre/seedrandom#released" diff --git a/ios/GLImage.m b/ios/GLImage.m index 16d07709c2d81c98883e54e19efa2aa01e6a13a6..158a3b1c2496c44d3f4c6ecc696c17cc7493878f 100644 --- a/ios/GLImage.m +++ b/ios/GLImage.m @@ -86,6 +86,7 @@ RCT_NOT_IMPLEMENTED(-init) clipped:YES resizeMode:RCTResizeModeStretch progressBlock:nil + partialLoadBlock:nil completionBlock:^(NSError *error, UIImage *loadedImage) { GLImage *strongSelf = weakSelf; void (^setImageBlock)(UIImage *) = ^(UIImage *image) { diff --git a/package.json b/package.json index e90fd7de5c4a472611282265b7b395c437142085..8611e4fec7f75ed047bfeb31a66ef2c37f6e8b24 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "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", "repository": { "type": "git",