mirror of
https://github.com/status-im/react-native.git
synced 2025-01-12 18:44:25 +00:00
Fix Travis CI runs
Summary: Closes https://github.com/facebook/react-native/pull/14286 Differential Revision: D5164925 Pulled By: javache fbshipit-source-id: 0ebe028ab58f37a9afc8b615fe346d7af9180040
This commit is contained in:
Pieter De Baets
Facebook Github Bot
parent
53169b0de3
commit
79500f81a9
@ -1,6 +1,6 @@
|
||||
language: objective-c
|
||||
|
||||
osx_image: xcode8.2
|
||||
osx_image: xcode8.3
|
||||
|
||||
install:
|
||||
- mkdir -p /Users/travis/build/facebook/.nvm
|
||||
|
||||
@ -29,6 +29,8 @@
|
||||
354631681B69857700AA0B86 /* RCTImageEditingManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 354631671B69857700AA0B86 /* RCTImageEditingManager.m */; };
|
||||
3D302E181DF8228100D6DDAE /* RCTImageUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 134B00A01B54232B00EC8DFB /* RCTImageUtils.h */; };
|
||||
3D302F211DF8269200D6DDAE /* RCTImageUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 134B00A01B54232B00EC8DFB /* RCTImageUtils.h */; };
|
||||
3DA05A5A1EE0312600805843 /* RCTImageShadowView.h in Headers */ = {isa = PBXBuildFile; fileRef = 59AB09281EDE5DD1009F97B5 /* RCTImageShadowView.h */; };
|
||||
3DA05A5B1EE0312900805843 /* RCTImageShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59AB09291EDE5DD1009F97B5 /* RCTImageShadowView.m */; };
|
||||
3DED3A8A1DE6F79800336DD7 /* RCTGIFImageDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1304D5B01AA8C50D0002E2BE /* RCTGIFImageDecoder.h */; };
|
||||
3DED3A8B1DE6F79800336DD7 /* RCTImageBlurUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = EEF314701C9B0DD30049118E /* RCTImageBlurUtils.h */; };
|
||||
3DED3A8C1DE6F79800336DD7 /* RCTImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = CCD34C251D4B8FE900268922 /* RCTImageCache.h */; };
|
||||
@ -197,6 +199,7 @@
|
||||
3DED3A9A1DE6F7A400336DD7 /* RCTImageLoader.h in Headers */,
|
||||
3DED3A9B1DE6F7A400336DD7 /* RCTImageStoreManager.h in Headers */,
|
||||
3DED3A9C1DE6F7A400336DD7 /* RCTImageUtils.h in Headers */,
|
||||
3DA05A5A1EE0312600805843 /* RCTImageShadowView.h in Headers */,
|
||||
3DED3A9D1DE6F7A400336DD7 /* RCTImageView.h in Headers */,
|
||||
3DED3A9E1DE6F7A400336DD7 /* RCTImageViewManager.h in Headers */,
|
||||
3DED3A9F1DE6F7A400336DD7 /* RCTLocalAssetImageLoader.h in Headers */,
|
||||
@ -290,6 +293,7 @@
|
||||
2D3B5F1C1D9B0D1300451313 /* RCTResizeMode.m in Sources */,
|
||||
2D3B5F221D9B0D1300451313 /* RCTImageViewManager.m in Sources */,
|
||||
2D3B5F211D9B0D1300451313 /* RCTImageView.m in Sources */,
|
||||
3DA05A5B1EE0312900805843 /* RCTImageShadowView.m in Sources */,
|
||||
2D3B5F201D9B0D1300451313 /* RCTImageLoader.m in Sources */,
|
||||
2D3B5F1B1D9B0D0700451313 /* RCTImageBlurUtils.m in Sources */,
|
||||
2D3B5F241D9B0D1300451313 /* RCTImageUtils.m in Sources */,
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
|
||||
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
@ -14,21 +18,18 @@
|
||||
<subviews>
|
||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 Facebook. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
|
||||
<rect key="frame" x="20" y="439" width="441" height="21"/>
|
||||
<animations/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="RNTester" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
|
||||
<rect key="frame" x="20" y="140" width="441" height="43"/>
|
||||
<animations/>
|
||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
|
||||
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<animations/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
|
||||
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
|
||||
|
||||
@ -1,33 +1,32 @@
|
||||
include_defs("//ReactAndroid/DEFS")
|
||||
|
||||
if not IS_OSS_BUILD:
|
||||
cxx_library(
|
||||
name = "jni",
|
||||
srcs = glob(["*.cpp"]),
|
||||
compiler_flags = [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
"-fexceptions",
|
||||
"-std=c++1y",
|
||||
"-frtti",
|
||||
],
|
||||
header_namespace = "",
|
||||
headers = glob(
|
||||
["*.h"],
|
||||
),
|
||||
preprocessor_flags = [
|
||||
"-DLOG_TAG=\"PackagerConnectionJNI\"",
|
||||
"-DWITH_FBSYSTRACE=1",
|
||||
"-DWITH_INSPECTOR=1",
|
||||
],
|
||||
soname = "libpackagerconnectionjnifb.$(ext)",
|
||||
visibility = [
|
||||
"PUBLIC",
|
||||
],
|
||||
xcode_public_headers_symlinks = True,
|
||||
deps = JSC_DEPS + [
|
||||
FBJNI_TARGET,
|
||||
"//xplat/folly:molly",
|
||||
react_native_xplat_target("jschelpers:jschelpers"),
|
||||
]
|
||||
)
|
||||
cxx_library(
|
||||
name = "jni",
|
||||
srcs = glob(["*.cpp"]),
|
||||
headers = glob(
|
||||
["*.h"],
|
||||
),
|
||||
header_namespace = "",
|
||||
compiler_flags = [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
"-fexceptions",
|
||||
"-std=c++1y",
|
||||
"-frtti",
|
||||
],
|
||||
preprocessor_flags = [
|
||||
"-DLOG_TAG=\"PackagerConnectionJNI\"",
|
||||
"-DWITH_FBSYSTRACE=1",
|
||||
"-DWITH_INSPECTOR=1",
|
||||
],
|
||||
soname = "libpackagerconnectionjnifb.$(ext)",
|
||||
visibility = [
|
||||
"PUBLIC",
|
||||
],
|
||||
xcode_public_headers_symlinks = True,
|
||||
deps = ([
|
||||
FBJNI_TARGET,
|
||||
"//xplat/folly:molly",
|
||||
react_native_xplat_target("jschelpers:jschelpers"),
|
||||
] + JSC_DEPS) if not IS_OSS_BUILD else [],
|
||||
)
|
||||
|
||||
@ -20,6 +20,12 @@ EXPORTED_HEADERS = [
|
||||
cxx_library(
|
||||
name = "jni",
|
||||
srcs = glob(["*.cpp"]),
|
||||
headers = glob(
|
||||
["*.h"],
|
||||
excludes = EXPORTED_HEADERS,
|
||||
),
|
||||
header_namespace = "react/jni",
|
||||
exported_headers = EXPORTED_HEADERS,
|
||||
compiler_flags = [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
@ -29,12 +35,6 @@ cxx_library(
|
||||
"-Wno-pessimizing-move",
|
||||
"-Wno-inconsistent-missing-override",
|
||||
],
|
||||
exported_headers = EXPORTED_HEADERS,
|
||||
header_namespace = "react/jni",
|
||||
headers = glob(
|
||||
["*.h"],
|
||||
excludes = EXPORTED_HEADERS,
|
||||
),
|
||||
preprocessor_flags = [
|
||||
"-DLOG_TAG=\"ReactNativeJNI\"",
|
||||
"-DWITH_FBSYSTRACE=1",
|
||||
@ -45,7 +45,7 @@ cxx_library(
|
||||
"PUBLIC",
|
||||
],
|
||||
xcode_public_headers_symlinks = True,
|
||||
deps = JSC_DEPS + [
|
||||
deps = ([
|
||||
"//native/third-party/android-ndk:android",
|
||||
"//xplat/folly:molly",
|
||||
"//xplat/fbgloginit:fbgloginit",
|
||||
@ -53,5 +53,5 @@ cxx_library(
|
||||
react_native_xplat_target("cxxreact:bridge"),
|
||||
react_native_xplat_target("cxxreact:module"),
|
||||
FBJNI_TARGET,
|
||||
],
|
||||
] + JSC_DEPS) if not IS_OSS_BUILD else [],
|
||||
)
|
||||
|
||||
@ -1,12 +1,21 @@
|
||||
# Set up common deps
|
||||
|
||||
# Building is not supported in OSS right now
|
||||
def rn_xplat_cxx_library(**kwargs):
|
||||
pass
|
||||
def rn_xplat_cxx_library(name, **kwargs):
|
||||
cxx_library(name = name)
|
||||
|
||||
# Helper for referring to an Android RN target
|
||||
def react_native_target(path):
|
||||
return '//ReactAndroid/src/main/' + path
|
||||
|
||||
# Helper for referring to an xplat RN target
|
||||
def react_native_xplat_target(path):
|
||||
return '//ReactCommon/' + path
|
||||
|
||||
GLOG_DEP = "//ReactAndroid/build/third-party-ndk/glog:glog"
|
||||
|
||||
INSPECTOR_FLAGS = []
|
||||
DEBUG_PREPROCESSOR_FLAGS = []
|
||||
STATIC_LIBRARY_IOS_FLAGS = []
|
||||
|
||||
JSC_DEPS = []
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user