Skip to content
This repository was archived by the owner on Mar 7, 2025. It is now read-only.

Commit 7d5905c

Browse files
committed
android x migration
1 parent 4dc15d1 commit 7d5905c

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

android-exoplayer/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ def safeExtGet(prop, fallback) {
55
}
66

77
android {
8-
compileSdkVersion safeExtGet('compileSdkVersion', 27)
9-
buildToolsVersion safeExtGet('buildToolsVersion', '27.0.3')
8+
compileSdkVersion safeExtGet('compileSdkVersion', 28)
9+
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
1010

1111
compileOptions {
1212
targetCompatibility JavaVersion.VERSION_1_8
@@ -15,7 +15,7 @@ android {
1515

1616
defaultConfig {
1717
minSdkVersion safeExtGet('minSdkVersion', 16)
18-
targetSdkVersion safeExtGet('targetSdkVersion', 27)
18+
targetSdkVersion safeExtGet('targetSdkVersion', 28)
1919
versionCode 1
2020
versionName "1.0"
2121
}
@@ -28,9 +28,9 @@ dependencies {
2828
}
2929

3030
// All support libs must use the same version
31-
implementation "com.android.support:support-annotations:${safeExtGet('supportLibVersion', '+')}"
32-
implementation "com.android.support:support-compat:${safeExtGet('supportLibVersion', '+')}"
33-
implementation "com.android.support:support-media-compat:${safeExtGet('supportLibVersion', '+')}"
31+
implementation "androidx.annotation:annotation:1.0.0"
32+
implementation "androidx.core:core:1.0.2"
33+
implementation "androidx.media:media:1.0.0"
3434

3535
implementation('com.google.android.exoplayer:extension-okhttp:2.9.3') {
3636
exclude group: 'com.squareup.okhttp3', module: 'okhttp'

android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
import android.annotation.TargetApi;
44
import android.content.Context;
5-
import android.support.v4.content.ContextCompat;
65
import android.util.AttributeSet;
7-
import android.util.Log;
86
import android.view.Gravity;
97
import android.view.SurfaceView;
108
import android.view.TextureView;
119
import android.view.View;
1210
import android.view.ViewGroup;
1311
import android.widget.FrameLayout;
1412

13+
import androidx.core.content.ContextCompat;
14+
1515
import com.google.android.exoplayer2.C;
1616
import com.google.android.exoplayer2.ExoPlaybackException;
1717
import com.google.android.exoplayer2.ExoPlayer;

android-exoplayer/src/main/java/com/brentvatne/exoplayer/ResizeMode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.brentvatne.exoplayer;
22

3-
import android.support.annotation.IntDef;
3+
import androidx.annotation.IntDef;
44

55
import java.lang.annotation.Retention;
66

android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.brentvatne.exoplayer;
22

3-
import android.support.annotation.StringDef;
43
import android.view.View;
54

5+
import androidx.annotation.StringDef;
6+
67
import com.facebook.react.bridge.Arguments;
78
import com.facebook.react.bridge.ReactContext;
89
import com.facebook.react.bridge.WritableArray;

android/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ apply plugin: 'com.android.library'
2020
android {
2121
compileSdkVersion safeExtGet('compileSdkVersion', 28)
2222
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
23+
supportLibVersion = safeExtGet('supportLibVersion', '28.0.0')
2324

2425
defaultConfig {
2526
minSdkVersion safeExtGet('minSdkVersion', 16)

0 commit comments

Comments
 (0)