Skip to content

Commit 6002494

Browse files
committed
Update dependencies to AndroidX
1 parent 3c9e0dd commit 6002494

File tree

8 files changed

+19
-17
lines changed

8 files changed

+19
-17
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Edit your project's `AndroidManifest.xml` file to reference your `MainApplicatio
9090
</intent-filter>
9191
</service>
9292

93-
<receiver android:name="android.support.v4.media.session.MediaButtonReceiver" >
93+
<receiver android:name="androidx.media.session.MediaButtonReceiver" >
9494
<intent-filter>
9595
<action android:name="android.intent.action.MEDIA_BUTTON" />
9696
</intent-filter>

android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ android {
2626

2727
defaultConfig {
2828
minSdkVersion 16
29-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3030
}
3131
lintOptions {
3232
disable 'InvalidPackage'
3333
}
3434
}
3535

3636
dependencies {
37-
implementation 'com.android.support:support-compat:28.0.0'
38-
implementation 'com.android.support:support-media-compat:28.0.0'
37+
implementation 'androidx.core:core:1.0.0'
38+
implementation 'androidx.media:media:1.0.0'
3939
}

android/src/main/java/com/ryanheise/audioservice/AudioService.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
import android.os.Build;
2020
import android.os.Bundle;
2121
import android.os.PowerManager;
22-
import android.support.annotation.RequiresApi;
23-
import android.support.v4.app.NotificationCompat;
22+
import androidx.annotation.RequiresApi;
23+
import androidx.core.app.NotificationCompat;
2424
import android.support.v4.media.MediaBrowserCompat;
25-
import android.support.v4.media.MediaBrowserServiceCompat;
25+
import androidx.media.MediaBrowserServiceCompat;
2626
import android.support.v4.media.MediaDescriptionCompat;
2727
import android.support.v4.media.MediaMetadataCompat;
2828
import android.support.v4.media.RatingCompat;
29-
import android.support.v4.media.app.NotificationCompat.MediaStyle;
30-
import android.support.v4.media.session.MediaButtonReceiver;
29+
import androidx.media.app.NotificationCompat.MediaStyle;
30+
import androidx.media.session.MediaButtonReceiver;
3131
import android.support.v4.media.session.MediaControllerCompat;
3232
import android.support.v4.media.session.MediaSessionCompat;
3333
import android.support.v4.media.session.PlaybackStateCompat;
@@ -146,7 +146,7 @@ NotificationCompat.Action action(String resource, String label, long actionCode)
146146
}
147147

148148
PendingIntent buildMediaButtonPendingIntent(long action) {
149-
ComponentName component = new ComponentName(getPackageName(), "android.support.v4.media.session.MediaButtonReceiver");
149+
ComponentName component = new ComponentName(getPackageName(), "androidx.media.session.MediaButtonReceiver");
150150
return buildMediaButtonPendingIntent(component, action);
151151
}
152152

android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import android.os.Bundle;
1010
import android.os.RemoteException;
1111
import android.os.SystemClock;
12-
import android.support.v4.app.NotificationCompat;
12+
import androidx.core.app.NotificationCompat;
1313
import android.support.v4.media.MediaBrowserCompat;
14-
import android.support.v4.media.MediaBrowserServiceCompat;
14+
import androidx.media.MediaBrowserServiceCompat;
1515
import android.support.v4.media.MediaDescriptionCompat;
1616
import android.support.v4.media.MediaMetadataCompat;
1717
import android.support.v4.media.RatingCompat;

example/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ android {
3737
targetSdkVersion 28
3838
versionCode flutterVersionCode.toInteger()
3939
versionName flutterVersionName
40-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
40+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4141
}
4242

4343
buildTypes {
@@ -55,6 +55,6 @@ flutter {
5555

5656
dependencies {
5757
testImplementation 'junit:junit:4.12'
58-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
59-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
58+
androidTestImplementation 'androidx.test:runner:1.1.1'
59+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
6060
}

example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</intent-filter>
4545
</service>
4646

47-
<receiver android:name="android.support.v4.media.session.MediaButtonReceiver" >
47+
<receiver android:name="androidx.media.session.MediaButtonReceiver" >
4848
<intent-filter>
4949
<action android:name="android.intent.action.MEDIA_BUTTON" />
5050
</intent-filter>

example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.2.1'
8+
classpath 'com.android.tools.build:gradle:3.3.0'
99
}
1010
}
1111

example/android/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
org.gradle.jvmargs=-Xmx1536M
2+
android.enableJetifier=true
3+
android.useAndroidX=true

0 commit comments

Comments
 (0)