Skip to content

Commit

Permalink
Merge branch 'fix/withRNVRNConfig' into fix/release-hotfixes
Browse files Browse the repository at this point in the history
* fix/withRNVRNConfig:
  disable react-native-permissions for tvos
  fix/withRNVRNConfig
  • Loading branch information
pavjacko committed Jan 26, 2024
2 parents 697f9c6 + eb42003 commit c3ab334
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
7 changes: 6 additions & 1 deletion packages/app-harness/renative.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@
},
"version": "2.3.0"
},
"react-native-permissions": "3.10.1",
"react-native-permissions": {
"ios": {
"podName": "RNPermissions"
},
"version": "3.10.1"
},
"react-native": {
"android": {
"implementation": "// TEST"
Expand Down
13 changes: 13 additions & 0 deletions packages/app-harness/src/app/index.tvos.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from 'react';
import { Text, View } from 'react-native';

const App = () => {
return (
<View>
<Text>ReNative Harness</Text>
<Text>{`hermes: ${typeof HermesInternal === 'object' && HermesInternal !== null ? 'yes' : 'no'}`}</Text>
</View>
);
};

export default App;
4 changes: 2 additions & 2 deletions packages/sdk-react-native/src/adapters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ const getApplicationId = () => {
const getSkipLinkingDeps = () => {
const skipLinkingEnv = process.env.RNV_SKIP_LINKING;
if (skipLinkingEnv) {
const plugins = skipLinkingEnv.split(',');
const plugins = skipLinkingEnv.split(',').map((item) => item.trim());

return {
dependencies: plugins.reduce((acc, plugin) => {
acc[`${plugin}`] = {
acc[plugin] = {
platforms: {
ios: null,
},
Expand Down

0 comments on commit c3ab334

Please sign in to comment.