From 8a8f21547e9d26a3e5b4d84a866093f48fab33cf Mon Sep 17 00:00:00 2001 From: vok Date: Sat, 6 Jul 2019 07:37:38 +0700 Subject: [PATCH 01/43] chang maven to google --- examples/basic/android/app/build.gradle | 11 ++++------- examples/basic/android/build.gradle | 4 +--- examples/basic/android/settings.gradle | 6 ------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/examples/basic/android/app/build.gradle b/examples/basic/android/app/build.gradle index 9813192114..77cc9f7a26 100644 --- a/examples/basic/android/app/build.gradle +++ b/examples/basic/android/app/build.gradle @@ -83,16 +83,16 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = false android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } defaultConfig { applicationId "com.videoplayer" - minSdkVersion 16 - targetSdkVersion 28 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -132,11 +132,8 @@ android { dependencies { implementation project(':react-native-video') - // compile "com.android.support:appcompat-v7:25.2.0" implementation "androidx.appcompat:appcompat:1.0.0" implementation "com.facebook.react:react-native:+" // From node_modules - // implementation project(':react-native-video') -// compile project(':react-native-video-exoplayer') // uncomment to use exoplayer } // Run this once to be able to run the application with BUCK diff --git a/examples/basic/android/build.gradle b/examples/basic/android/build.gradle index 3161c39de4..5e5d6decd1 100644 --- a/examples/basic/android/build.gradle +++ b/examples/basic/android/build.gradle @@ -24,9 +24,7 @@ buildscript { allprojects { repositories { mavenLocal() - maven { - url 'https://maven.google.com' - } + google() maven { url "https://jitpack.io" } diff --git a/examples/basic/android/settings.gradle b/examples/basic/android/settings.gradle index 4de2c7838f..5fc7fca440 100644 --- a/examples/basic/android/settings.gradle +++ b/examples/basic/android/settings.gradle @@ -3,10 +3,4 @@ rootProject.name = 'VideoPlayer' include ':react-native-video' project(':react-native-video').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-video/android-exoplayer') -// Quick Local Development -//project(':react-native-video').projectDir = new File(rootProject.projectDir, '../../android') -//project(':react-native-video-exoplayer').projectDir = new File(rootProject.projectDir, '../../android-exoplayer') - -// project(':react-native-video').projectDir = new File(rootProject.projectDir, '../../android') -// project(':react-native-video-exoplayer').projectDir = new File(rootProject.projectDir, '../../android-exoplayer') include ':app' From 47e1630679b1e48421337c32b00c787c3aa63b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marin=CC=83o?= Date: Wed, 10 Jul 2019 08:06:28 +0200 Subject: [PATCH 02/43] remove rnpm --- package.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package.json b/package.json index 08b0dafcfd..7b33428ac1 100644 --- a/package.json +++ b/package.json @@ -45,11 +45,6 @@ "scripts": { "test": "node_modules/.bin/eslint *.js" }, - "rnpm": { - "android": { - "sourceDir": "./android-exoplayer" - } - }, "files": [ "android-exoplayer", "android", From 6bdbaec506454f3837bd698c3b983929c0acbe50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marin=CC=83o?= Date: Fri, 12 Jul 2019 10:17:23 +0200 Subject: [PATCH 03/43] 4.4.4 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dada084585..a7e9c1c6ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## Changelog -### next +### Version 4.4.4 * Handle racing conditions when props are setted on exoplayer ### Version 4.4.3 diff --git a/package.json b/package.json index c878ba45ef..af8649ace3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-video", - "version": "4.4.3", + "version": "4.4.4", "description": "A