Skip to content
This repository has been archived by the owner on Mar 12, 2020. It is now read-only.

Update to React Native 0.26.2 and React 15.0.2 #117

Merged
merged 3 commits into from May 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion Emission.podspec
Expand Up @@ -25,7 +25,7 @@ Pod::Spec.new do |s|
ss.resource = 'Pod/Assets/Emission.jsbundle'
ss.dependency 'Artsy+UIFonts', '>= 1.1.0'

react_version = '>= 0.24.0-rc5'
react_version = '~> 0.26.2'
ss.dependency 'React/Core', react_version
ss.dependency 'React/RCTText', react_version
ss.dependency 'React/RCTNetwork', react_version
Expand Down
8 changes: 8 additions & 0 deletions Example/Emission.xcodeproj/project.pbxproj
Expand Up @@ -501,6 +501,10 @@
INFOPLIST_FILE = Emission/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
"$(inherited)",
"-lstdc++",
);
PRODUCT_BUNDLE_IDENTIFIER = net.artsy.Emission;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand All @@ -520,6 +524,10 @@
INFOPLIST_FILE = Emission/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
"$(inherited)",
"-lstdc++",
);
PRODUCT_BUNDLE_IDENTIFIER = net.artsy.Emission;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand Down
9 changes: 5 additions & 4 deletions Example/EmissionTests/TestApps.js
Expand Up @@ -2,9 +2,10 @@
'use strict';

import Emission from 'emission';
import React from 'react-native';
const { View } = React;
const { TestModule } = React.NativeModules;
import React from 'react';
import ReactNative from 'react-native';
const { View } = ReactNative;
const { TestModule } = ReactNative.NativeModules;

class OpaqueImageViewTest extends React.Component {
assert() {
Expand All @@ -20,4 +21,4 @@ class OpaqueImageViewTest extends React.Component {
}
}

React.AppRegistry.registerComponent('OpaqueImageView', () => OpaqueImageViewTest);
ReactNative.AppRegistry.registerComponent('OpaqueImageView', () => OpaqueImageViewTest);
21 changes: 11 additions & 10 deletions Example/Podfile.lock
Expand Up @@ -12,9 +12,9 @@ PODS:
- Emission/ViewControllers
- Emission/Core (0.1.0):
- Artsy+UIFonts (>= 1.1.0)
- React/Core (>= 0.24.0-rc5)
- React/RCTNetwork (>= 0.24.0-rc5)
- React/RCTText (>= 0.24.0-rc5)
- React/Core (~> 0.26.2)
- React/RCTNetwork (~> 0.26.2)
- React/RCTText (~> 0.26.2)
- Emission/OpaqueImageViewComponent (0.1.0):
- SDWebImage (>= 3.7.2)
- Emission/SpinnerComponent (0.1.0):
Expand All @@ -41,13 +41,14 @@ PODS:
- UIView+BooleanAnimations
- Extraction/UIView+ARSpinner (0.1.0)
- FLKAutoLayout (1.0.0)
- React/Core (0.24.0-rc5)
- React/RCTNetwork (0.24.0-rc5):
- React/Core (0.26.2)
- React/RCTNetwork (0.26.2):
- React/Core
- React/RCTTest (0.24.0-rc5)
- React/RCTText (0.24.0-rc5):
- React/RCTTest (0.26.2):
- React/Core
- React/RCTWebSocket (0.24.0-rc5):
- React/RCTText (0.26.2):
- React/Core
- React/RCTWebSocket (0.26.2):
- React/Core
- SDWebImage (3.7.5):
- SDWebImage/Core (= 3.7.5)
Expand Down Expand Up @@ -90,10 +91,10 @@ CHECKOUT OPTIONS:
SPEC CHECKSUMS:
Artsy+UIColors: 10a2d71e9ffe1015be43d4e084d13ff4337aab97
Artsy+UIFonts: 108bfe625c45008ebb15c4c62003882dd345c4b8
Emission: 868e5ceafe8e8d8cd10cdb436d16e4424f636ec0
Emission: 397a3e7cc8937058e9704ebadef85ab615254a68
Extraction: 30a669899836cbe9c31bbc0e86918cd7a2dab463
FLKAutoLayout: 106b14dbae09d32c6730190f4e78a959759ba4a4
React: 9df7c9ebbc8256031adcc82ed9fede2730f98874
React: a764d67f6cf360723120951301cba3ee5ee05ce2
SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461
Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2
UIView+BooleanAnimations: a760be9a066036e55f298b7b7350a6cb14cfcd97
Expand Down
6 changes: 3 additions & 3 deletions Example/Pods/Local Podspecs/Emission.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions Example/Pods/Local Podspecs/React.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 11 additions & 10 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.