From f2da308928a0af42343b4cd58082065697cd8f94 Mon Sep 17 00:00:00 2001 From: Andrei Coman Date: Wed, 26 Aug 2015 06:02:44 -0700 Subject: [PATCH 1/2] [ReactNative] Add unimplemented views for some components --- .../DrawerAndroid/DrawerLayoutAndroid.ios.js | 13 +++++++++++++ .../Components/SwitchAndroid/SwitchAndroid.ios.js | 13 +++++++++++++ .../Components/ToolbarAndroid/ToolbarAndroid.ios.js | 13 +++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js create mode 100644 Libraries/Components/SwitchAndroid/SwitchAndroid.ios.js create mode 100644 Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js new file mode 100644 index 000000000..6c0b34e3b --- /dev/null +++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js @@ -0,0 +1,13 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @providesModule DrawerLayoutAndroid + */ +'use strict'; + +module.exports = require('UnimplementedView'); diff --git a/Libraries/Components/SwitchAndroid/SwitchAndroid.ios.js b/Libraries/Components/SwitchAndroid/SwitchAndroid.ios.js new file mode 100644 index 000000000..d14807207 --- /dev/null +++ b/Libraries/Components/SwitchAndroid/SwitchAndroid.ios.js @@ -0,0 +1,13 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @providesModule SwitchAndroid + */ +'use strict'; + +module.exports = require('UnimplementedView'); diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js new file mode 100644 index 000000000..28a8901ff --- /dev/null +++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js @@ -0,0 +1,13 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @providesModule ToolbarAndroid + */ +'use strict'; + +module.exports = require('UnimplementedView'); From 9ffbfaeb350abb70588e55e7e41c4aa91c921a7e Mon Sep 17 00:00:00 2001 From: Martin Konicek Date: Wed, 26 Aug 2015 16:20:36 -0100 Subject: [PATCH 2/2] [ReactNative] Disable flaky Obj-C test --- Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m index 670530114..dd50708e3 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTAllocationTests.m @@ -157,7 +157,7 @@ RCT_EXPORT_METHOD(test:(__unused NSString *)a XCTAssertNil(weakExecutor, @"JavaScriptExecutor should have been released"); } -- (void)testJavaScriptContextIsDeallocated +- (void)disabled_testJavaScriptContextIsDeallocated { __weak id weakContext; @autoreleasepool {