From 88d3a4a0bab6780149e07fb6b01bae08cdc0754e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marin=CC=83o?= Date: Sun, 28 Jul 2019 15:42:32 +0200 Subject: [PATCH 01/12] cpck androidx --- .../java/com/brentvatne/exoplayer/ExoPlayerView.java | 2 +- .../main/java/com/brentvatne/exoplayer/ResizeMode.java | 2 +- .../java/com/brentvatne/exoplayer/VideoEventEmitter.java | 2 +- examples/basic/android/app/build.gradle | 9 +++++---- examples/basic/android/gradle.properties | 2 ++ 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java index fc966005b5..9f3d09bed0 100644 --- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java +++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java @@ -2,7 +2,7 @@ import android.annotation.TargetApi; import android.content.Context; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.util.Log; import android.view.Gravity; diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ResizeMode.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ResizeMode.java index 002c32ad4f..ceea420c14 100644 --- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ResizeMode.java +++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ResizeMode.java @@ -1,6 +1,6 @@ package com.brentvatne.exoplayer; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java index 00f51c94cd..24d51e026f 100644 --- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java +++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java @@ -1,6 +1,6 @@ package com.brentvatne.exoplayer; -import android.support.annotation.StringDef; +import androidx.annotation.StringDef; import android.view.View; import com.facebook.react.bridge.Arguments; diff --git a/examples/basic/android/app/build.gradle b/examples/basic/android/app/build.gradle index 915e4eca61..e661ad0305 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 rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion + compileSdkVersion 28 + buildToolsVersion '28.0.3' compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } defaultConfig { applicationId "com.videoplayer" - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + minSdkVersion 19 + targetSdkVersion 28 versionCode 1 versionName "1.0" ndk { @@ -111,6 +111,7 @@ android { release { signingConfig signingConfigs.debug minifyEnabled enableProguardInReleaseBuilds + matchingFallbacks = ['release', 'debug'] proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } } diff --git a/examples/basic/android/gradle.properties b/examples/basic/android/gradle.properties index 1fd964e90b..e77af9f29c 100644 --- a/examples/basic/android/gradle.properties +++ b/examples/basic/android/gradle.properties @@ -18,3 +18,5 @@ # org.gradle.parallel=true android.useDeprecatedNdk=true +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file From 6bd8f33f0efe73f587b81a9a49bc6f301a0e01d1 Mon Sep 17 00:00:00 2001 From: vok Date: Wed, 19 Jun 2019 14:46:20 +0700 Subject: [PATCH 02/12] change minSdkVersion back to 16 (cherry picked from commit a96fa33714c76923df927e59c54b09d594ca9ae5) --- examples/basic/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/basic/android/app/build.gradle b/examples/basic/android/app/build.gradle index e661ad0305..5ad4bc6c16 100644 --- a/examples/basic/android/app/build.gradle +++ b/examples/basic/android/app/build.gradle @@ -91,7 +91,7 @@ android { } defaultConfig { applicationId "com.videoplayer" - minSdkVersion 19 + minSdkVersion 16 targetSdkVersion 28 versionCode 1 versionName "1.0" From 45b806dbb3127b85a9bf31c2ff5652fa36a20496 Mon Sep 17 00:00:00 2001 From: vok Date: Wed, 19 Jun 2019 15:38:36 +0700 Subject: [PATCH 03/12] update readme (cherry picked from commit 3ddcba3449e815d9af1c298c90fab3e7ff327e5d) --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 2c40b188e5..748bc6c5e1 100644 --- a/README.md +++ b/README.md @@ -134,6 +134,14 @@ dependencies { } ``` +**android/settings.gradle** + +Migrating to AndroidX: + +```gradle.properties +android.useAndroidX=true +android.enableJetifier=true +``` #### **android/gradle.properties** From 991fd5961d542f5bb8a380cd8e15ea87fc79e9a9 Mon Sep 17 00:00:00 2001 From: vok Date: Thu, 20 Jun 2019 09:06:51 +0700 Subject: [PATCH 04/12] add readme to migrating to AndroidX (cherry picked from commit 976ebcce2df8edcbe50d14a15a1fa9561810b9a5) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 748bc6c5e1..2fdc56d54b 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ dependencies { } ``` -**android/settings.gradle** +**android/gradle.properties** Migrating to AndroidX: From e6e57ecb0464ed47a218d1b0b925e8bcf9478e40 Mon Sep 17 00:00:00 2001 From: vok Date: Thu, 20 Jun 2019 09:26:53 +0700 Subject: [PATCH 05/12] cpck readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2fdc56d54b..e14b6143ed 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,8 @@ From version >= 5.0.0, you have to apply this changes: dependencies { ... compile project(':react-native-video') - implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" ++ implementation "androidx.appcompat:appcompat:1.0.0" +- implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" } ``` From 2f8746c990d94569ca356e45c6dc17b56ad82929 Mon Sep 17 00:00:00 2001 From: vok Date: Fri, 21 Jun 2019 09:22:00 +0700 Subject: [PATCH 06/12] fix read me (cherry picked from commit ed25b3f924dab95b7d2b0b5c4022e49eccff31dc) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e14b6143ed..4615909780 100644 --- a/README.md +++ b/README.md @@ -130,8 +130,8 @@ From version >= 5.0.0, you have to apply this changes: dependencies { ... compile project(':react-native-video') -+ implementation "androidx.appcompat:appcompat:1.0.0" -- implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" ++ implementation "androidx.appcompat:appcompat:1.0.0" +- implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" } ``` From a1679efef2a61f9366711ca748507698586384f6 Mon Sep 17 00:00:00 2001 From: vok Date: Sat, 6 Jul 2019 07:37:38 +0700 Subject: [PATCH 07/12] chang maven to google (cherry picked from commit 8a8f21547e9d26a3e5b4d84a866093f48fab33cf) --- examples/basic/android/app/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/basic/android/app/build.gradle b/examples/basic/android/app/build.gradle index 5ad4bc6c16..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 { From 4f9f7936a4a605d196122c6d37ff8ee3a6b30c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mari=C3=B1o=20Ruiz?= <1237997+CHaNGeTe@users.noreply.github.com> Date: Tue, 23 Jul 2019 11:29:50 +0200 Subject: [PATCH 08/12] cpck --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index 4615909780..6daf10422d 100644 --- a/README.md +++ b/README.md @@ -135,14 +135,6 @@ dependencies { } ``` -**android/gradle.properties** - -Migrating to AndroidX: - -```gradle.properties -android.useAndroidX=true -android.enableJetifier=true -``` #### **android/gradle.properties** From e38149b476bfcb10e700611bf05f774f65ceb03f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marin=CC=83o?= Date: Tue, 23 Jul 2019 11:54:55 +0200 Subject: [PATCH 09/12] ad platform installation to TOC (cherry picked from commit b0737bd56a4743c5154f48533a2f097ec59622a5) --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6daf10422d..cde69aac37 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,11 @@ Version 3.0 features a number of changes to existing behavior. See [Updating](#u ## Table of Contents * [Installation](#installation) + * [iOS](#ios-installation) + * [tvOS](#tvos-installation) + * [Android](#android-installation) + * [Windows](#windows-installation) + * [react-native-dom](#react-native-dom-installation) * [Usage](#usage) * [iOS App Transport Security](#ios-app-transport-security) * [Audio Mixing](#audio-mixing) @@ -42,7 +47,7 @@ yarn add react-native-video Then follow the instructions for your platform to link react-native-video into your project: -### iOS +### iOS installation
iOS details @@ -74,7 +79,7 @@ end
-### tvOS +### tvOS installation
tvOS details @@ -97,7 +102,7 @@ Select RCTVideo-tvOS
-### Android +### Android installation
Android details @@ -121,7 +126,6 @@ include ':react-native-video' project(':react-native-video').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-video/android') ``` - #### **android/app/build.gradle** From version >= 5.0.0, you have to apply this changes: @@ -166,7 +170,7 @@ protected List getPackages() { ```
-### Windows +### Windows installation
Windows details @@ -216,7 +220,7 @@ using System.Collections.Generic; ```
-### react-native-dom +### react-native-dom installation
react-native-dom details From aad75d46b15a2f065ef8b6ece071dbd4b628a145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marin=CC=83o?= Date: Thu, 25 Jul 2019 09:17:39 +0200 Subject: [PATCH 10/12] More update info (cherry picked from commit 2f23cc021c2e61410076c2f05da334907479280f) --- README.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/README.md b/README.md index cde69aac37..35d6a87ed9 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,16 @@ A `