Skip to content
This repository was archived by the owner on Oct 6, 2022. It is now read-only.

Commit 260f720

Browse files
timmywiltanguyantoine
authored andcommitted
fix(android): migrate support libraries to androidx
This fixes compilation with RN 0.60 Fixes gh-280
1 parent b572320 commit 260f720

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

android/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ repositories {
4040

4141
dependencies {
4242
compileOnly 'com.facebook.react:react-native:+'
43-
implementation "com.android.support:support-media-compat:${safeExtGet('supportLibVersion', '26.+')}"
43+
implementation 'androidx.core:core:1.0.2'
44+
implementation 'androidx.media:media:1.0.1'
4445
}

android/src/main/java/com/tanguyantoine/react/MusicControlEventEmitter.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import android.content.Intent;
44
import android.os.Build;
5-
import android.support.v4.content.ContextCompat;
5+
import androidx.core.content.ContextCompat;
66

77
import com.facebook.react.bridge.Arguments;
88
import com.facebook.react.bridge.ReactApplicationContext;
9-
import com.facebook.react.bridge.ReactContext;
109
import com.facebook.react.bridge.WritableMap;
1110
import com.facebook.react.modules.core.DeviceEventManagerModule;
1211

android/src/main/java/com/tanguyantoine/react/MusicControlModule.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
import android.media.AudioManager;
1515
import android.os.SystemClock;
1616
import android.os.Build;
17-
import android.support.annotation.RequiresApi;
17+
import androidx.annotation.RequiresApi;
1818
import android.support.v4.media.MediaMetadataCompat;
1919
import android.support.v4.media.RatingCompat;
2020
import android.support.v4.media.session.MediaSessionCompat;
2121
import android.support.v4.media.session.PlaybackStateCompat;
22-
import android.support.v4.app.NotificationCompat;
23-
import android.support.v4.media.app.NotificationCompat.MediaStyle;
22+
import androidx.core.app.NotificationCompat;
23+
import androidx.media.app.NotificationCompat.MediaStyle;
2424
import android.util.Log;
2525
import com.facebook.react.bridge.ReactApplicationContext;
2626
import com.facebook.react.bridge.ReactContextBaseJavaModule;

android/src/main/java/com/tanguyantoine/react/MusicControlNotification.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
import android.content.res.Resources;
1111
import android.os.Build;
1212
import android.os.IBinder;
13-
import android.support.v4.app.NotificationManagerCompat;
13+
import androidx.core.app.NotificationCompat;
14+
import androidx.core.app.NotificationManagerCompat;
1415
import android.support.v4.media.session.PlaybackStateCompat;
15-
import android.support.v4.app.NotificationCompat;
1616
import android.view.KeyEvent;
1717
import com.facebook.react.bridge.ReactApplicationContext;
1818
import com.facebook.react.bridge.ReadableMap;
1919

2020
import java.util.Map;
2121

22-
import static android.support.v4.app.NotificationCompat.PRIORITY_MIN;
22+
import static androidx.core.app.NotificationCompat.PRIORITY_MIN;
2323
import static com.tanguyantoine.react.MusicControlModule.CHANNEL_ID;
2424
import static com.tanguyantoine.react.MusicControlModule.NOTIFICATION_ID;
2525

android/src/main/java/com/tanguyantoine/react/MusicControlVolumeListener.java

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

3-
import android.support.v4.media.VolumeProviderCompat;
3+
import androidx.media.VolumeProviderCompat;
44
import com.facebook.react.bridge.ReactApplicationContext;
55

66
public class MusicControlVolumeListener extends VolumeProviderCompat {

0 commit comments

Comments
 (0)