Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ver 1.0.7 - Version for UM, DONT MERGE #65

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Ver 1.0.7 - Version for UM, DONT MERGE #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0915ec7
React Native version updated to 0.73.6 native module 0.20.1
DusanTargetVideo Apr 9, 2024
8d6abb3
Migration to media 3
DusanTargetVideo Apr 18, 2024
7dfea91
version updated
DusanTargetVideo Apr 18, 2024
e1fcdae
Android updated java to 17 and 1.1.63-media3 version
DusanTargetVideo May 31, 2024
9fd46aa
New version 1.0.7 iOS working on all arch, Android related videos bug…
DusanTargetVideo May 31, 2024
f9e1077
Version upgraded to 1.0.7
DusanTargetVideo May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:7.2.1"
classpath "com.android.tools.build:gradle:7.2.2"
}
}

Expand Down Expand Up @@ -49,8 +49,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

}
Expand All @@ -66,9 +66,8 @@ dependencies {
// For < 0.71, this will be from the local maven repo
// For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
//noinspection GradleDynpm namicVersion
implementation "com.facebook.react:react-native:+"
implementation 'tv.brid.sdk:bridsdk:1.1.6-SNAPSHOT'

implementation "com.facebook.react:react-native:0.20.1"
implementation 'tv.brid.sdk:bridsdk:1.1.63-media3'
}

if (isNewArchitectureEnabled()) {
Expand Down
4 changes: 2 additions & 2 deletions example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ buildscript {
ext {
buildToolsVersion = "33.0.0"
minSdkVersion = 21
compileSdkVersion = 33
targetSdkVersion = 33
compileSdkVersion = 34
targetSdkVersion = 34

// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
ndkVersion = "23.1.7779620"
Expand Down
1 change: 0 additions & 1 deletion example/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ target 'BridtvSdkModuleExample' do
__apply_Xcode_12_5_M1_post_install_workaround(installer)
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = "arm64"
end
end
end
Expand Down
4,475 changes: 1,668 additions & 2,807 deletions example/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
},
"dependencies": {
"react": "18.2.0",
"react-native": "0.71.7"
"react-native": "0.73.6",
"react-native-gradle-plugin": "^0.71.19"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand Down
5 changes: 2 additions & 3 deletions example/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';
import { Text } from 'react-native';
1;
import {
StyleSheet,
View,
Expand Down Expand Up @@ -158,7 +157,7 @@ const App = () => {
/>
)} */}
<View style={styles.buttonContainer} />
{video3 && (
{/* {video3 && (
<BridPlayer
ref={bridPlayerRef3}
style={styles.square}
Expand All @@ -173,7 +172,7 @@ const App = () => {
handleAllPlayerEvents(eventData)
}
/>
)}
)} */}

<View style={styles.buttonContainer}>
<Button
Expand Down
Loading