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] 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 fc966005..9f3d09be 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 @@ package com.brentvatne.exoplayer; 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 002c32ad..ceea420c 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 00f51c94..24d51e02 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 915e4eca..e661ad03 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 1fd964e9..e77af9f2 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