Skip to content

Commit bb3a616

Browse files
ElenaDiachenkoElenaDiachenko
committed
fix ios
1 parent 8000d13 commit bb3a616

File tree

10 files changed

+175
-203
lines changed

10 files changed

+175
-203
lines changed

‎packages/app-harness/Gemfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ ruby ">= 2.6.10"
66
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
77
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
88
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9-
gem 'xcodeproj', '< 1.26.0'
9+
gem 'xcodeproj', '< 1.26.0'
10+
gem 'cocoapods-user-defined-build-types'

‎packages/app-harness/Gemfile.lock‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,10 @@ PLATFORMS
9191
ruby
9292

9393
DEPENDENCIES
94-
activesupport (~> 7.0, <= 7.0.8)
95-
cocoapods (~> 1.13, < 1.15)
94+
activesupport (>= 6.1.7.5, != 7.1.0)
95+
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
9696
cocoapods-user-defined-build-types
97+
xcodeproj (< 1.26.0)
9798

9899
RUBY VERSION
99100
ruby 3.0.2p107

‎packages/app-harness/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
"react-native-carplay": "2.3.0",
5656
"react-native-fs": "2.20.0",
5757
"react-native-gesture-handler": "2.21.2",
58-
"react-native-google-cast": "4.8.0",
58+
"react-native-google-cast": "4.8.3",
5959
"react-native-orientation-locker": "1.7.0",
60-
"react-native-permissions": "4.1.5",
60+
"react-native-permissions": "5.2.1",
6161
"react-native-photo-editor": "github:AppGyver/react-native-photo-editor#0.1.2",
6262
"react-native-safe-area-context": "5.0.0",
6363
"react-native-splash-screen": "3.3.0",

‎packages/config-templates/renative.templates.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,11 @@
455455
},
456456
"@react-native-community/cli": {
457457
"disableNpm": true,
458-
"version": "^12.3.6",
458+
"version": "^15.0.1",
459459
"supportedPlatforms": ["tvos", "ios"]
460460
},
461461
"@react-native-community/cli-platform-android": {
462-
"version": "^12.3.6"
462+
"version": "^15.0.1"
463463
},
464464
"@react-native-community/cli-platform-ios": {
465465
"version": "12.3.6",
@@ -2463,7 +2463,7 @@
24632463
"DISABLE_DISCOVERY_AUTOSTART": "false",
24642464
"START_DISCOVERY_AFTER_FIRST_TAP_ON_CAST_BUTTON": "false"
24652465
},
2466-
"version": "4.8.0"
2466+
"version": "4.8.3"
24672467
},
24682468
"react-native-home-indicator": {
24692469
"ios": {
@@ -2900,7 +2900,7 @@
29002900
"tvos": {
29012901
"podName": "RNPermissions"
29022902
},
2903-
"version": "4.1.5"
2903+
"version": "5.2.1"
29042904
},
29052905
"react-native-permissions-pods": {
29062906
"ios": {
@@ -3579,7 +3579,7 @@
35793579
"version": "0.40.1"
35803580
},
35813581
"react-native-windows": {
3582-
"version": "0.67.3"
3582+
"version": "0.76.2"
35833583
},
35843584
"react-native-zip-archive": {
35853585
"android": {
@@ -3681,7 +3681,7 @@
36813681
"Sentry": {
36823682
"ios": {
36833683
"podName": "Sentry",
3684-
"version": "5.2.0"
3684+
"version": "6.4.0"
36853685
},
36863686
"disableNpm": true
36873687
},

‎packages/engine-rn/templates/platforms/ios/RNVApp.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
7C717EEC7024EA4A970A8C0B /* libPods-RNVApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNVApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
7070
9408A3872A97997800B2E736 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = "<group>"; };
7171
9408A3882A97997800B2E736 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
72-
13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = RNVApp/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
7372
9408A3892A97997800B2E736 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
7473
96722C6F859B298386E53EEC /* libPods-RNVApp-RNVAppTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNVApp-RNVAppTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
7574
AF8EFAC6D34EF718C410C11B /* Pods_RNVAppUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNVAppUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -137,7 +136,6 @@
137136
200133021F6BF9CF00450340 /* Info.plist */,
138137
200132FA1F6BF9CF00450340 /* RNVApp.xcdatamodeld */,
139138
207BDA3F24AB543F00F32013 /* LaunchScreen.storyboard */,
140-
13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */,
141139
);
142140
path = RNVApp;
143141
sourceTree = "<group>";

‎packages/engine-rn/templates/platforms/ios/RNVApp/PrivacyInfo.xcprivacy‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎packages/sdk-android/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"typescript": "5.2.2"
3838
},
3939
"peerDependencies": {
40-
"@react-native-community/cli": "^12.3.6",
41-
"@react-native-community/cli-platform-android": "^12.3.6",
40+
"@react-native-community/cli": "^15.0.1",
41+
"@react-native-community/cli-platform-android": "^15.0.1",
4242
"@rnv/core": "^1.8.0-rc.0"
4343
},
4444
"publishConfig": {

‎packages/sdk-apple/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"xcode": "3.0.1"
3939
},
4040
"peerDependencies": {
41-
"@react-native-community/cli": "^12.3.6",
41+
"@react-native-community/cli": "^15.0.1",
4242
"@react-native-community/cli-platform-ios": "^12.3.6",
4343
"@rnv/core": "^1.8.0-rc.0"
4444
},

‎packages/sdk-apple/src/privacyManifestParser.ts‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import path from 'path';
2-
import { getConfigProp, fsWriteFileSync, getAppFolder, doResolve, logError } from '@rnv/core';
2+
import { getConfigProp, fsWriteFileSync, getAppFolder, doResolve, logError, fsExistsSync } from '@rnv/core';
33
import { getAppFolderName } from './common';
44

55
export const parsePrivacyManifest = () => {
@@ -27,7 +27,7 @@ export const parsePrivacyManifest = () => {
2727
return `<string>${reason}</string>`;
2828
}).join('\n')}
2929
</array>
30-
<dict>
30+
</dict>
3131
`;
3232
})
3333
.join('')}
@@ -39,25 +39,34 @@ export const parsePrivacyManifest = () => {
3939
const appFolder = getAppFolder();
4040
const appFolderName = getAppFolderName();
4141

42-
const filePath = path.join(appFolder, `${appFolderName}/PrivacyInfo.xcprivacy`);
43-
fsWriteFileSync(filePath, output);
42+
const primaryPath = path.join(appFolder, 'PrivacyInfo.xcprivacy');
43+
const secondaryPath = path.join(appFolder, `${appFolderName}/PrivacyInfo.xcprivacy`);
4444

45-
const xcodePath = doResolve('xcode');
46-
if (!xcodePath) {
47-
logError(`Cannot resolve xcode path`);
45+
if (fsExistsSync(primaryPath) || fsExistsSync(secondaryPath)) {
46+
const existingFilePath = fsExistsSync(primaryPath) ? primaryPath : secondaryPath;
47+
fsWriteFileSync(existingFilePath, output);
4848
resolve();
49-
return;
50-
}
49+
} else {
50+
const filePath = secondaryPath;
51+
fsWriteFileSync(filePath, output);
5152

52-
const xcode = require(xcodePath);
53-
const projectPath = path.join(appFolder, `${appFolderName}.xcodeproj/project.pbxproj`);
54-
const xcodeProj = xcode.project(projectPath);
53+
const xcodePath = doResolve('xcode');
54+
if (!xcodePath) {
55+
logError(`Cannot resolve xcode path`);
56+
resolve();
57+
return;
58+
}
5559

56-
xcodeProj.parse(() => {
57-
xcodeProj.addResourceFile(filePath);
58-
fsWriteFileSync(projectPath, xcodeProj.writeSync());
59-
resolve();
60-
});
60+
const xcode = require(xcodePath);
61+
const projectPath = path.join(appFolder, `${appFolderName}.xcodeproj/project.pbxproj`);
62+
const xcodeProj = xcode.project(projectPath);
63+
64+
xcodeProj.parse(() => {
65+
xcodeProj.addResourceFile(filePath);
66+
fsWriteFileSync(projectPath, xcodeProj.writeSync());
67+
resolve();
68+
});
69+
}
6170
} else {
6271
resolve();
6372
}

0 commit comments

Comments
 (0)