Skip to content

Commit f08701e

Browse files
hurali97hurali97
committed
Merge branch 'main' of github.com:callstack/react-native-brownfield into feat/expo-updates
2 parents cda692b + a4de8d2 commit f08701e

15 files changed

Lines changed: 76 additions & 33 deletions

File tree

‎.changeset/crisp-crabs-mate.md‎

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

‎.github/actions/setup/action.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ runs:
3232
.turbo
3333
apps/*/.turbo
3434
packages/*/.turbo
35-
key: ${{ runner.os }}-turbo-${{ hashFiles('.turbo', '**/.turbo') }}
35+
key: ${{ runner.os }}-turbo-${{ hashFiles('yarn.lock', 'package-lock.json', 'pnpm-lock.yaml', 'turbo.json', 'apps/*/turbo.json', 'packages/*/turbo.json') }}
3636
restore-keys: |
3737
${{ runner.os }}-turbo-
38+

‎apps/RNApp/Gemfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
source 'https://rubygems.org'
22

33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4-
ruby '>= 2.6.10'
4+
ruby '>= 3.1.0'
55

6-
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7-
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
6+
gem 'activesupport', '~> 7.2.3', '>= 7.2.3.1'
87
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
98
gem 'concurrent-ruby', '< 1.3.4'
109
gem 'xcodeproj', '< 1.26.0'

‎apps/RNApp/Gemfile.lock‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,25 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
CFPropertyList (3.0.8)
5-
activesupport (7.0.8.7)
6-
concurrent-ruby (~> 1.0, >= 1.0.2)
5+
activesupport (7.2.3.1)
6+
base64
7+
benchmark (>= 0.3)
8+
bigdecimal
9+
concurrent-ruby (~> 1.0, >= 1.3.1)
10+
connection_pool (>= 2.2.5)
11+
drb
712
i18n (>= 1.6, < 2)
8-
minitest (>= 5.1)
9-
tzinfo (~> 2.0)
10-
addressable (2.8.8)
13+
logger (>= 1.4.2)
14+
minitest (>= 5.1, < 6)
15+
securerandom (>= 0.3)
16+
tzinfo (~> 2.0, >= 2.0.5)
17+
addressable (2.9.0)
1118
public_suffix (>= 2.0.2, < 8.0)
1219
algoliasearch (1.27.5)
1320
httpclient (~> 2.8, >= 2.8.3)
1421
json (>= 1.5.1)
1522
atomos (0.1.3)
23+
base64 (0.3.0)
1624
benchmark (0.5.0)
1725
bigdecimal (4.0.1)
1826
claide (1.1.0)
@@ -55,6 +63,8 @@ GEM
5563
cocoapods-try (1.2.0)
5664
colored2 (3.1.2)
5765
concurrent-ruby (1.3.3)
66+
connection_pool (3.0.2)
67+
drb (2.2.3)
5868
escape (0.0.4)
5969
ethon (0.15.0)
6070
ffi (>= 1.15.0)
@@ -68,7 +78,7 @@ GEM
6878
concurrent-ruby (~> 1.0)
6979
json (2.19.2)
7080
logger (1.7.0)
71-
minitest (5.26.1)
81+
minitest (5.27.0)
7282
molinillo (0.8.0)
7383
mutex_m (0.3.0)
7484
nanaimo (0.3.0)
@@ -78,6 +88,7 @@ GEM
7888
public_suffix (4.0.7)
7989
rexml (3.4.4)
8090
ruby-macho (2.5.1)
91+
securerandom (0.4.1)
8192
typhoeus (1.5.0)
8293
ethon (>= 0.9.0, < 0.16.0)
8394
tzinfo (2.0.6)
@@ -94,7 +105,7 @@ PLATFORMS
94105
ruby
95106

96107
DEPENDENCIES
97-
activesupport (>= 6.1.7.5, != 7.1.0)
108+
activesupport (~> 7.2.3, >= 7.2.3.1)
98109
benchmark
99110
bigdecimal
100111
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
@@ -105,7 +116,7 @@ DEPENDENCIES
105116
xcodeproj (< 1.26.0)
106117

107118
RUBY VERSION
108-
ruby 2.7.6p219
119+
ruby 3.3.6p108
109120

110121
BUNDLED WITH
111122
2.4.12

‎apps/RNApp/ios/RNApp.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
/* Begin PBXBuildFile section */
1010
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
11-
46C6B253D4AD6D41C31E1382 /* Pods_RNApp_BrownfieldLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 214247ABACB5A114E0342DB2 /* Pods_RNApp_BrownfieldLib.framework */; };
1211
761780ED2CA45674006654EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EC2CA45674006654EE /* AppDelegate.swift */; };
1312
79BD1EE92EEBFB76003AA29F /* BrownfieldLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79BD1EE32EEBFB76003AA29F /* BrownfieldLib.framework */; };
1413
79BD1EEA2EEBFB76003AA29F /* BrownfieldLib.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 79BD1EE32EEBFB76003AA29F /* BrownfieldLib.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1514
79F35E8C2EEC1D4500E64860 /* BrownfieldLib.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F35E8A2EEC1D4500E64860 /* BrownfieldLib.swift */; };
1615
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
16+
A0777EAAAA3FC7C5E02611A4 /* Pods_RNApp_BrownfieldLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FBC148EBB082E19EA065F91F /* Pods_RNApp_BrownfieldLib.framework */; };
1717
C66C2A65406C527E9529D08F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */; };
18-
D2B5AEB3AE2CA535C80E7606 /* Pods_RNApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8712CB54BE756F7B17EC3C63 /* Pods_RNApp.framework */; };
18+
ED0516C81FD8393A3D6B4371 /* Pods_RNApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2065C22D9167CC092D4BB5F7 /* Pods_RNApp.framework */; };
1919
/* End PBXBuildFile section */
2020

2121
/* Begin PBXContainerItemProxy section */
@@ -47,17 +47,17 @@
4747
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = RNApp/Images.xcassets; sourceTree = "<group>"; };
4848
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNApp/Info.plist; sourceTree = "<group>"; };
4949
13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = RNApp/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
50-
214247ABACB5A114E0342DB2 /* Pods_RNApp_BrownfieldLib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNApp_BrownfieldLib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
50+
2065C22D9167CC092D4BB5F7 /* Pods_RNApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5151
3B4392A12AC88292D35C810B /* Pods-RNApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNApp.debug.xcconfig"; path = "Target Support Files/Pods-RNApp/Pods-RNApp.debug.xcconfig"; sourceTree = "<group>"; };
5252
5709B34CF0A7D63546082F79 /* Pods-RNApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNApp.release.xcconfig"; path = "Target Support Files/Pods-RNApp/Pods-RNApp.release.xcconfig"; sourceTree = "<group>"; };
5353
761780EC2CA45674006654EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = RNApp/AppDelegate.swift; sourceTree = "<group>"; };
5454
79BD1EE32EEBFB76003AA29F /* BrownfieldLib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BrownfieldLib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5555
79F35E8A2EEC1D4500E64860 /* BrownfieldLib.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrownfieldLib.swift; sourceTree = "<group>"; };
5656
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = RNApp/LaunchScreen.storyboard; sourceTree = "<group>"; };
57-
8712CB54BE756F7B17EC3C63 /* Pods_RNApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5857
8A02E03D9F74B585B0A8F7F7 /* Pods-RNApp-BrownfieldLib.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNApp-BrownfieldLib.debug.xcconfig"; path = "Target Support Files/Pods-RNApp-BrownfieldLib/Pods-RNApp-BrownfieldLib.debug.xcconfig"; sourceTree = "<group>"; };
5958
D8C030F60E402FD6CFBB3904 /* Pods-RNApp-BrownfieldLib.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNApp-BrownfieldLib.release.xcconfig"; path = "Target Support Files/Pods-RNApp-BrownfieldLib/Pods-RNApp-BrownfieldLib.release.xcconfig"; sourceTree = "<group>"; };
6059
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
60+
FBC148EBB082E19EA065F91F /* Pods_RNApp_BrownfieldLib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNApp_BrownfieldLib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6161
/* End PBXFileReference section */
6262

6363
/* Begin PBXFrameworksBuildPhase section */
@@ -66,15 +66,15 @@
6666
buildActionMask = 2147483647;
6767
files = (
6868
79BD1EE92EEBFB76003AA29F /* BrownfieldLib.framework in Frameworks */,
69-
D2B5AEB3AE2CA535C80E7606 /* Pods_RNApp.framework in Frameworks */,
69+
ED0516C81FD8393A3D6B4371 /* Pods_RNApp.framework in Frameworks */,
7070
);
7171
runOnlyForDeploymentPostprocessing = 0;
7272
};
7373
79BD1EE02EEBFB76003AA29F /* Frameworks */ = {
7474
isa = PBXFrameworksBuildPhase;
7575
buildActionMask = 2147483647;
7676
files = (
77-
46C6B253D4AD6D41C31E1382 /* Pods_RNApp_BrownfieldLib.framework in Frameworks */,
77+
A0777EAAAA3FC7C5E02611A4 /* Pods_RNApp_BrownfieldLib.framework in Frameworks */,
7878
);
7979
runOnlyForDeploymentPostprocessing = 0;
8080
};
@@ -97,8 +97,8 @@
9797
isa = PBXGroup;
9898
children = (
9999
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
100-
8712CB54BE756F7B17EC3C63 /* Pods_RNApp.framework */,
101-
214247ABACB5A114E0342DB2 /* Pods_RNApp_BrownfieldLib.framework */,
100+
2065C22D9167CC092D4BB5F7 /* Pods_RNApp.framework */,
101+
FBC148EBB082E19EA065F91F /* Pods_RNApp_BrownfieldLib.framework */,
102102
);
103103
name = Frameworks;
104104
sourceTree = "<group>";

‎packages/brownfield-navigation/CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# @callstack/brownfield-navigation
22

3+
## 3.6.1
4+
5+
### Patch Changes
6+
7+
- [#305](https://github.com/callstack/react-native-brownfield/pull/305) [`eab53d9`](https://github.com/callstack/react-native-brownfield/commit/eab53d9f7b93f38e13185020fcf8a7af23df0d05) Thanks [@hurali97](https://github.com/hurali97)! - fix securiy vulnerabilities
8+
9+
- Updated dependencies [[`eab53d9`](https://github.com/callstack/react-native-brownfield/commit/eab53d9f7b93f38e13185020fcf8a7af23df0d05)]:
10+
- @callstack/brownfield-cli@3.6.1
11+
312
## 3.6.0
413

514
### Patch Changes

‎packages/brownfield-navigation/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@callstack/brownfield-navigation",
3-
"version": "3.6.0",
3+
"version": "3.6.1",
44
"license": "MIT",
55
"author": "Hur Ali",
66
"description": "Brownfield navigation helpers for React Native",

‎packages/brownfield/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# brownfield
22

3+
## 3.6.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`eab53d9`](https://github.com/callstack/react-native-brownfield/commit/eab53d9f7b93f38e13185020fcf8a7af23df0d05)]:
8+
- @callstack/brownfield-cli@3.6.1
9+
310
## 3.6.0
411

512
### Patch Changes

‎packages/brownfield/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "brownfield",
3-
"version": "3.6.0",
3+
"version": "3.6.1",
44
"license": "MIT",
55
"author": "Artur Morys-Magiera <artus9033@gmail.com>",
66
"bin": "dist/index.js",

‎packages/brownie/CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# @callstack/brownie
22

3+
## 3.6.1
4+
5+
### Patch Changes
6+
7+
- [#305](https://github.com/callstack/react-native-brownfield/pull/305) [`eab53d9`](https://github.com/callstack/react-native-brownfield/commit/eab53d9f7b93f38e13185020fcf8a7af23df0d05) Thanks [@hurali97](https://github.com/hurali97)! - fix securiy vulnerabilities
8+
9+
- Updated dependencies [[`eab53d9`](https://github.com/callstack/react-native-brownfield/commit/eab53d9f7b93f38e13185020fcf8a7af23df0d05)]:
10+
- @callstack/brownfield-cli@3.6.1
11+
312
## 3.6.0
413

514
### Patch Changes

0 commit comments

Comments
 (0)