Skip to content

Commit e73baaf

Browse files
authored
chore: update to react-native 0.73.0 (#4918)
chore: add support to react-native 0.73.0 --------- authored-by: salah ghanim <salah.ghanim@gmail.com>
1 parent 8003483 commit e73baaf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+7974
-6736
lines changed

Diff for: .eslintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"extends": "@react-native-community",
2+
"extends": "@react-native",
33
"ignorePatterns": "lib" // ts outdir
44
}

Diff for: .github/workflows/androidBuild.yml

+14-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,21 @@ on:
66
jobs:
77
build-android:
88
runs-on: ubuntu-latest
9-
109
steps:
10+
- uses: actions/checkout@v4
11+
- name: Setup JDK 17
12+
uses: actions/setup-java@v4
13+
with:
14+
java-version: 17
15+
distribution: temurin
16+
17+
- name: Setup Android SDK
18+
uses: amyu/setup-android@v4
19+
with:
20+
cache-disabled: true
21+
sdk-version: 34
22+
build-tools-version: 33.0.2
23+
1124
- name: Check out repository code
1225
uses: actions/checkout@v3
1326

Diff for: .github/workflows/iosFrameworksBuild.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@ jobs:
2727
- name: Install dependencies
2828
run: yarn --cwd example --frozen-lockfile
2929

30-
- name: Use frameworks
31-
run: mv example/ios/PodfileFrameworks example/ios/Podfile
32-
3330
- name: Install pods
34-
run: yarn pod-install
31+
run: USE_FRAMEWORKS=static RCT_NEW_ARCH_ENABLED=0 NO_FLIPPER=1 bundle exec pod install
32+
working-directory: example/ios
3533

3634
- name: Write Config.xcconfig
3735
run: echo MAPS_API_KEY=your_api_key_here >> example/ios/Config.xcconfig

Diff for: .gitignore

+27
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ DerivedData
2323
project.xcworkspace
2424
Pods/
2525
AirMapsExplorer.xcworkspace/
26+
ios/.xcode.env.local
2627

2728
# Android/IntelliJ
2829
#
@@ -31,13 +32,29 @@ build/
3132
.gradle
3233
local.properties
3334
*.iml
35+
*.hprof
36+
.cxx/
37+
*.keystore
38+
!debug.keystore
3439

3540
# node.js
3641
#
3742
node_modules/
3843
npm-debug.log
3944
yarn-error.log
4045

46+
# fastlane
47+
#
48+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
49+
# screenshots whenever they are needed.
50+
# For more information about the recommended setup visit:
51+
# https://docs.fastlane.tools/best-practices/source-control/
52+
53+
**/fastlane/report.xml
54+
**/fastlane/Preview.html
55+
**/fastlane/screenshots
56+
**/fastlane/test_output
57+
4158
# Bundle artifact
4259
*.jsbundle
4360

@@ -50,3 +67,13 @@ lib/
5067
example/vendor/bundle/
5168

5269
example/ios/Config.xcconfig
70+
71+
# Ruby / CocoaPods
72+
/ios/Pods/
73+
/vendor/bundle/
74+
75+
# Temporary files created by Metro to check the health of the file watcher
76+
.metro-health-check*
77+
78+
# testing
79+
/coverage

Diff for: android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
mavenCentral()
1313
}
1414
dependencies {
15-
classpath("com.android.tools.build:gradle:4.2.2")
15+
classpath("com.android.tools.build:gradle:7.6.3")
1616
}
1717
}
1818
}
@@ -25,11 +25,11 @@ android {
2525
namespace "com.rnmaps.maps"
2626
}
2727

28-
compileSdkVersion safeExtGet('compileSdkVersion', 31)
28+
compileSdk safeExtGet('compileSdkVersion', 34)
2929

3030
defaultConfig {
3131
minSdkVersion safeExtGet('minSdkVersion', 21)
32-
targetSdkVersion safeExtGet('targetSdkVersion', 31)
32+
targetSdkVersion safeExtGet('targetSdkVersion', 34)
3333
}
3434
}
3535

Diff for: android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

Diff for: babel.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
presets: ['module:metro-react-native-babel-preset'],
2+
presets: ['module:@react-native/babel-preset'],
33
};

Diff for: example/.buckconfig

-6
This file was deleted.

Diff for: example/Gemfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
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 ">= 2.6.10"
55

6-
gem 'cocoapods', '>= 1.11.3'
6+
gem 'cocoapods', '~> 1.13'
7+
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'

Diff for: example/Gemfile.lock

+16-14
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ GEM
88
i18n (>= 1.6, < 2)
99
minitest (>= 5.1)
1010
tzinfo (~> 2.0)
11-
addressable (2.8.4)
11+
addressable (2.8.6)
1212
public_suffix (>= 2.0.2, < 6.0)
1313
algoliasearch (1.27.5)
1414
httpclient (~> 2.8, >= 2.8.3)
1515
json (>= 1.5.1)
1616
atomos (0.1.3)
1717
claide (1.1.0)
18-
cocoapods (1.12.1)
18+
cocoapods (1.14.3)
1919
addressable (~> 2.8)
2020
claide (>= 1.0.2, < 2.0)
21-
cocoapods-core (= 1.12.1)
21+
cocoapods-core (= 1.14.3)
2222
cocoapods-deintegrate (>= 1.0.3, < 2.0)
23-
cocoapods-downloader (>= 1.6.0, < 2.0)
23+
cocoapods-downloader (>= 2.1, < 3.0)
2424
cocoapods-plugins (>= 1.0.0, < 2.0)
2525
cocoapods-search (>= 1.0.0, < 2.0)
2626
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -32,8 +32,8 @@ GEM
3232
molinillo (~> 0.8.0)
3333
nap (~> 1.0)
3434
ruby-macho (>= 2.3.0, < 3.0)
35-
xcodeproj (>= 1.21.0, < 2.0)
36-
cocoapods-core (1.12.1)
35+
xcodeproj (>= 1.23.0, < 2.0)
36+
cocoapods-core (1.14.3)
3737
activesupport (>= 5.0, < 8)
3838
addressable (~> 2.8)
3939
algoliasearch (~> 1.0)
@@ -44,7 +44,7 @@ GEM
4444
public_suffix (~> 4.0)
4545
typhoeus (~> 1.0)
4646
cocoapods-deintegrate (1.0.5)
47-
cocoapods-downloader (1.6.3)
47+
cocoapods-downloader (2.1)
4848
cocoapods-plugins (1.0.0)
4949
nap
5050
cocoapods-search (1.0.1)
@@ -57,27 +57,27 @@ GEM
5757
escape (0.0.4)
5858
ethon (0.16.0)
5959
ffi (>= 1.15.0)
60-
ffi (1.15.5)
60+
ffi (1.16.3)
6161
fourflusher (2.3.1)
6262
fuzzy_match (2.0.4)
6363
gh_inspector (1.1.3)
6464
httpclient (2.8.3)
6565
i18n (1.12.0)
6666
concurrent-ruby (~> 1.0)
67-
json (2.6.3)
67+
json (2.7.1)
6868
minitest (5.18.0)
6969
molinillo (0.8.0)
7070
nanaimo (0.3.0)
7171
nap (1.1.0)
7272
netrc (0.11.0)
7373
public_suffix (4.0.7)
74-
rexml (3.2.5)
74+
rexml (3.2.6)
7575
ruby-macho (2.5.1)
76-
typhoeus (1.4.0)
76+
typhoeus (1.4.1)
7777
ethon (>= 0.9.0)
7878
tzinfo (2.0.6)
7979
concurrent-ruby (~> 1.0)
80-
xcodeproj (1.22.0)
80+
xcodeproj (1.23.0)
8181
CFPropertyList (>= 2.3.3, < 4.0)
8282
atomos (~> 0.1.3)
8383
claide (>= 1.0.2, < 2.0)
@@ -87,12 +87,14 @@ GEM
8787

8888
PLATFORMS
8989
ruby
90+
x86_64-linux
9091

9192
DEPENDENCIES
92-
cocoapods (>= 1.11.3)
93+
activesupport (>= 6.1.7.3, < 7.1.0)
94+
cocoapods (~> 1.13)
9395

9496
RUBY VERSION
9597
ruby 3.2.2p53
9698

9799
BUNDLED WITH
98-
2.4.10
100+
2.4.13

0 commit comments

Comments
 (0)