update for androidX

This commit is contained in:
vok
2019-06-19 14:37:21 +07:00
parent e28ae17579
commit 4f36eb1254
13 changed files with 4100 additions and 2511 deletions

View File

@@ -5,8 +5,8 @@ def safeExtGet(prop, fallback) {
}
android {
compileSdkVersion safeExtGet('compileSdkVersion', 27)
buildToolsVersion safeExtGet('buildToolsVersion', '27.0.3')
compileSdkVersion safeExtGet('compileSdkVersion', 28)
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
@@ -15,7 +15,7 @@ android {
defaultConfig {
minSdkVersion safeExtGet('minSdkVersion', 16)
targetSdkVersion safeExtGet('targetSdkVersion', 27)
targetSdkVersion safeExtGet('targetSdkVersion', 28)
versionCode 1
versionName "1.0"
}
@@ -28,9 +28,12 @@ dependencies {
}
// All support libs must use the same version
implementation "com.android.support:support-annotations:${safeExtGet('supportLibVersion', '+')}"
implementation "com.android.support:support-compat:${safeExtGet('supportLibVersion', '+')}"
implementation "com.android.support:support-media-compat:${safeExtGet('supportLibVersion', '+')}"
// implementation "com.android.support:support-annotations:${safeExtGet('supportLibVersion', '+')}"
implementation "androidx.annotation:annotation:1.0.0"
// implementation "com.android.support:support-compat:${safeExtGet('supportLibVersion', '+')}"
implementation "androidx.core:core:1.0.0"
// implementation "com.android.support:support-media-compat:${safeExtGet('supportLibVersion', '+')}"
implementation "androidx.media:media:1.0.0"
implementation('com.google.android.exoplayer:extension-okhttp:2.9.3') {
exclude group: 'com.squareup.okhttp3', module: 'okhttp'

View File

@@ -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;

View File

@@ -1,6 +1,6 @@
package com.brentvatne.exoplayer;
import android.support.annotation.IntDef;
import androidx.annotation.IntDef;
import java.lang.annotation.Retention;

View File

@@ -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;