Skip to content

Commit 91a6adf

Browse files
chaimPanethchaimPaneth
committed
Merge branch 'release/0.2.43'
2 parents d0cc235 + 878e35a commit 91a6adf

22 files changed

+1314
-1567
lines changed

‎Example/.flowconfig

+1-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ nonstrict-import=warn
5151
deprecated-type=warn
5252
unsafe-getters-setters=warn
5353
unnecessary-invariant=warn
54-
signature-verification-failure=warn
5554

5655
[strict]
5756
deprecated-type
@@ -63,4 +62,4 @@ untyped-import
6362
untyped-type-import
6463

6564
[version]
66-
^0.137.0
65+
^0.182.0

‎Example/.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23+
ios/.xcode.env.local
2324

2425
# Android/IntelliJ
2526
#
@@ -28,6 +29,8 @@ build/
2829
.gradle
2930
local.properties
3031
*.iml
32+
*.hprof
33+
.cxx/
3134

3235
# node.js
3336
#
@@ -51,6 +54,7 @@ buck-out/
5154
*/fastlane/report.xml
5255
*/fastlane/Preview.html
5356
*/fastlane/screenshots
57+
**/fastlane/test_output
5458

5559
# Bundle artifact
5660
*.jsbundle

‎Example/Gemfile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://rubygems.org'
2+
3+
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4+
ruby '>= 2.6.10'
5+
6+
gem 'cocoapods', '>= 1.11.3'
7+
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'

‎Example/Gemfile.lock

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.6)
5+
rexml
6+
activesupport (7.0.8)
7+
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
i18n (>= 1.6, < 2)
9+
minitest (>= 5.1)
10+
tzinfo (~> 2.0)
11+
addressable (2.8.6)
12+
public_suffix (>= 2.0.2, < 6.0)
13+
algoliasearch (1.27.5)
14+
httpclient (~> 2.8, >= 2.8.3)
15+
json (>= 1.5.1)
16+
atomos (0.1.3)
17+
claide (1.1.0)
18+
cocoapods (1.14.3)
19+
addressable (~> 2.8)
20+
claide (>= 1.0.2, < 2.0)
21+
cocoapods-core (= 1.14.3)
22+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
23+
cocoapods-downloader (>= 2.1, < 3.0)
24+
cocoapods-plugins (>= 1.0.0, < 2.0)
25+
cocoapods-search (>= 1.0.0, < 2.0)
26+
cocoapods-trunk (>= 1.6.0, < 2.0)
27+
cocoapods-try (>= 1.1.0, < 2.0)
28+
colored2 (~> 3.1)
29+
escape (~> 0.0.4)
30+
fourflusher (>= 2.3.0, < 3.0)
31+
gh_inspector (~> 1.0)
32+
molinillo (~> 0.8.0)
33+
nap (~> 1.0)
34+
ruby-macho (>= 2.3.0, < 3.0)
35+
xcodeproj (>= 1.23.0, < 2.0)
36+
cocoapods-core (1.14.3)
37+
activesupport (>= 5.0, < 8)
38+
addressable (~> 2.8)
39+
algoliasearch (~> 1.0)
40+
concurrent-ruby (~> 1.1)
41+
fuzzy_match (~> 2.0.4)
42+
nap (~> 1.0)
43+
netrc (~> 0.11)
44+
public_suffix (~> 4.0)
45+
typhoeus (~> 1.0)
46+
cocoapods-deintegrate (1.0.5)
47+
cocoapods-downloader (2.1)
48+
cocoapods-plugins (1.0.0)
49+
nap
50+
cocoapods-search (1.0.1)
51+
cocoapods-trunk (1.6.0)
52+
nap (>= 0.8, < 2.0)
53+
netrc (~> 0.11)
54+
cocoapods-try (1.2.0)
55+
colored2 (3.1.2)
56+
concurrent-ruby (1.2.2)
57+
escape (0.0.4)
58+
ethon (0.16.0)
59+
ffi (>= 1.15.0)
60+
ffi (1.16.3)
61+
fourflusher (2.3.1)
62+
fuzzy_match (2.0.4)
63+
gh_inspector (1.1.3)
64+
httpclient (2.8.3)
65+
i18n (1.14.1)
66+
concurrent-ruby (~> 1.0)
67+
json (2.7.1)
68+
minitest (5.20.0)
69+
molinillo (0.8.0)
70+
nanaimo (0.3.0)
71+
nap (1.1.0)
72+
netrc (0.11.0)
73+
public_suffix (4.0.7)
74+
rexml (3.2.6)
75+
ruby-macho (2.5.1)
76+
typhoeus (1.4.1)
77+
ethon (>= 0.9.0)
78+
tzinfo (2.0.6)
79+
concurrent-ruby (~> 1.0)
80+
xcodeproj (1.23.0)
81+
CFPropertyList (>= 2.3.3, < 4.0)
82+
atomos (~> 0.1.3)
83+
claide (>= 1.0.2, < 2.0)
84+
colored2 (~> 3.1)
85+
nanaimo (~> 0.3.0)
86+
rexml (~> 3.2.4)
87+
88+
PLATFORMS
89+
x86_64-darwin-21
90+
91+
DEPENDENCIES
92+
activesupport (>= 6.1.7.3, < 7.1.0)
93+
cocoapods (>= 1.11.3)
94+
95+
RUBY VERSION
96+
ruby 3.1.2p20
97+
98+
BUNDLED WITH
99+
2.4.3

‎Example/android/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ buildscript {
1414
jcenter()
1515
}
1616
dependencies {
17-
classpath('com.android.tools.build:gradle:7.1.2')
17+
classpath('com.android.tools.build:gradle:7.2.1')
18+
classpath("com.facebook.react:react-native-gradle-plugin")
19+
classpath("de.undercouch:gradle-download-task:5.0.1")
1820
// NOTE: Do not place your application dependencies here; they belong
1921
// in the individual module build.gradle files
2022
}

‎Example/android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue Aug 17 02:37:01 EEST 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

‎Example/android/settings.gradle

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
rootProject.name = 'RNJWPlayer'
22
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
33
include ':app'
4+
includeBuild('../node_modules/react-native-gradle-plugin')
5+
6+
if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
7+
include(":ReactAndroid")
8+
project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
9+
include(":ReactAndroid:hermes-engine")
10+
project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
11+
}

‎Example/ios/.xcode.env

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# This `.xcode.env` file is versioned and is used to source the environment
2+
# used when running script phases inside Xcode.
3+
# To customize your local environment, you can create an `.xcode.env.local`
4+
# file that is not versioned.
5+
6+
# NODE_BINARY variable contains the PATH to the node executable.
7+
#
8+
# Customize the NODE_BINARY variable here.
9+
# For example, to use nvm with brew, add the following line
10+
# . "$(brew --prefix nvm)/nvm.sh" --no-use
11+
export NODE_BINARY=$(command -v node)

‎Example/ios/Podfile

+17-11
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,21 @@ $RNJWPlayerUseGoogleCast = true
1010
target 'RNJWPlayer' do
1111
config = use_native_modules!
1212

13+
# Flags change depending on the env values.
1314
flags = get_default_flags()
1415

1516
use_react_native!(
1617
:path => config[:reactNativePath],
17-
# to enable hermes on iOS, change `false` to `true` and then install pods
18-
:hermes_enabled => flags[:hermes_enabled],
18+
# Hermes is now enabled by default. Disable by setting this flag to false.
19+
# Upcoming versions of React Native may rely on get_default_flags(), but
20+
# we make it explicit here to aid in the React Native upgrade process.
21+
:hermes_enabled => true,
1922
:fabric_enabled => flags[:fabric_enabled],
23+
# Enables Flipper.
24+
#
25+
# Note that if you have use_frameworks! enabled, Flipper will not work and
26+
# you should disable the next line.
27+
:flipper_configuration => FlipperConfiguration.enabled,
2028
# An absolute path to your application root.
2129
:app_path => "#{Pod::Config.instance.installation_root}/.."
2230
)
@@ -26,15 +34,13 @@ target 'RNJWPlayer' do
2634
# Pods for testing
2735
end
2836

29-
# Enables Flipper.
30-
#
31-
# Note that if you have use_frameworks! enabled, Flipper will not work and
32-
# you should disable the next line.
33-
use_flipper!()
34-
3537
post_install do |installer|
36-
react_native_post_install(installer)
38+
react_native_post_install(
39+
installer,
40+
# Set `mac_catalyst_enabled` to `true` in order to apply patches
41+
# necessary for Mac Catalyst builds
42+
:mac_catalyst_enabled => false
43+
)
3744
__apply_Xcode_12_5_M1_post_install_workaround(installer)
3845
end
39-
end
40-
46+
end

0 commit comments

Comments
 (0)