Skip to content

Commit 2ddda10

Browse files
authored
Merge pull request #9 from apivideo/feature/react_native_0_76
Feature/react native 0 76
2 parents e3442db + 0727f3d commit 2ddda10

35 files changed

+24004
-15893
lines changed

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
babel.config.js
2+
node_modules

.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
root: true,
3+
extends: '@react-native',
4+
};

.github/workflows/android-ci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,31 @@ jobs:
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v4
14+
1415
- name: Set up Node.js
1516
uses: actions/setup-node@v4
1617
with:
1718
node-version: 18
1819
cache: 'yarn'
20+
1921
- name: Set up JDK
2022
uses: actions/setup-java@v4
2123
with:
2224
distribution: adopt
2325
java-version: 17
26+
2427
- name: Install package npm dependencies
2528
run: yarn --frozen-lockfile
26-
shell: bash
29+
2730
- name: Install example npm dependencies
28-
run: yarn example --frozen-lockfile
29-
shell: bash
31+
run: yarn --frozen-lockfile
32+
working-directory: example
33+
3034
- name: Build Android test app
3135
uses: gradle/gradle-build-action@v2
3236
with:
3337
gradle-version: wrapper
3438
arguments: -PnewArchEnabled=${{matrix.newArchEnabled}} :app:assembleRelease
3539
build-root-directory: example/android
40+
3641
timeout-minutes: 60

.github/workflows/ios-ci.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,31 @@ jobs:
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v4
14+
1415
- name: Install latest Xcode
1516
uses: maxim-lobanov/setup-xcode@v1
1617
with:
1718
xcode-version: latest-stable
19+
1820
- name: Set up Node.js
1921
uses: actions/setup-node@v4
2022
with:
2123
node-version: 18
2224
cache: 'yarn'
25+
2326
- name: Install package npm dependencies
2427
run: yarn --frozen-lockfile
25-
shell: bash
28+
2629
- name: Install example npm dependencies
27-
run: yarn example --frozen-lockfile
28-
shell: bash
29-
- name: Install Ruby gems
30-
run: gem install cocoapods -v 1.15.2
30+
run: yarn --frozen-lockfile
31+
working-directory: example
32+
3133
- name: Install Pods
3234
run: ${{matrix.extraEnv}} pod install
3335
working-directory: example/ios
36+
3437
- name: Build iOS test app
3538
run: xcodebuild -workspace Example.xcworkspace -scheme Example -destination "platform=iOS Simulator,name=iPhone 14" CODE_SIGNING_ALLOWED=NO COMPILER_INDEX_STORE_ENABLE=NO build
3639
working-directory: example/ios
40+
3741
timeout-minutes: 60

.gitignore

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
#
33
.DS_Store
44

5-
# XDE
6-
.expo/
7-
8-
# VSCode
9-
.vscode/
10-
jsconfig.json
11-
125
# Xcode
136
#
147
build/
@@ -27,45 +20,55 @@ DerivedData
2720
*.hmap
2821
*.ipa
2922
*.xcuserstate
30-
project.xcworkspace
31-
.xcode.env.local
23+
**/.xcode.env.local
3224

33-
# Android/IJ
25+
# Android/IntelliJ
3426
#
35-
.classpath
36-
.cxx
37-
.gradle
27+
build/
3828
.idea
39-
.project
40-
.settings
29+
.gradle
4130
local.properties
42-
android.iml
43-
44-
# Cocoapods
45-
#
46-
example/ios/Pods
47-
48-
# Ruby
49-
example/vendor/
31+
*.iml
32+
*.hprof
33+
.cxx/
34+
*.keystore
35+
!debug.keystore
5036

5137
# node.js
5238
#
5339
node_modules/
5440
npm-debug.log
55-
yarn-debug.log
5641
yarn-error.log
5742

58-
# BUCK
59-
buck-out/
60-
\.buckd/
61-
android/app/libs
62-
android/keystores/debug.keystore
43+
# fastlane
44+
#
45+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
46+
# screenshots whenever they are needed.
47+
# For more information about the recommended setup visit:
48+
# https://docs.fastlane.tools/best-practices/source-control/
49+
50+
**/fastlane/report.xml
51+
**/fastlane/Preview.html
52+
**/fastlane/screenshots
53+
**/fastlane/test_output
54+
55+
# Bundle artifact
56+
*.jsbundle
57+
58+
# Ruby / CocoaPods
59+
**/Pods/
60+
/vendor/bundle/
6361

64-
# Expo
65-
.expo/
62+
# Temporary files created by Metro to check the health of the file watcher
63+
.metro-health-check*
6664

67-
# Turborepo
68-
.turbo/
65+
# testing
66+
/coverage
6967

70-
# generated by bob
71-
lib/
68+
# Yarn
69+
.yarn/*
70+
!.yarn/patches
71+
!.yarn/plugins
72+
!.yarn/releases
73+
!.yarn/sdks
74+
!.yarn/versions

.prettierrc.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module.exports = {
2+
arrowParens: 'avoid',
3+
bracketSameLine: true,
4+
bracketSpacing: false,
5+
singleQuote: true,
6+
trailingComma: 'all',
7+
};

.yarn/releases/yarn-3.6.4.cjs

Lines changed: 874 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
nodeLinker: node-modules
2+
3+
yarnPath: .yarn/releases/yarn-3.6.4.cjs

android/gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ApiVideoUploader_kotlinVersion=1.8.0
1+
ApiVideoUploader_kotlinVersion=1.9.24
22
ApiVideoUploader_minSdkVersion=24
33
ApiVideoUploader_targetSdkVersion=34
4-
ApiVideoUploader_compileSdkVersion=34
5-
ApiVideoUploader_ndkversion=25.1.8937393
4+
ApiVideoUploader_compileSdkVersion=35
5+
ApiVideoUploader_ndkversion=26.1.10909125

example/Gemfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
7-
# bound in the template on Cocoapods with next React Native release.
8-
gem 'cocoapods', '>= 1.13', '< 1.15'
9-
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'

0 commit comments

Comments
 (0)