Skip to content

Commit f77ddb8

Browse files
nic0lettenic0lette
committed
Migrate to AndroidX.
Change-Id: Ib5b7b52c3c9dc9550009dfa19c1065ab6d4ed2be
1 parent f42add3 commit f77ddb8

31 files changed

+138
-123
lines changed

‎build.gradle‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,20 @@
1919

2020
buildscript {
2121
ext {
22-
constraint_layout_version = '1.1.2'
23-
kotlin_version = '1.2.30'
24-
support_lib_version = '27.1.1'
22+
app_compat_version = '1.1.0-alpha04'
23+
constraint_layout_version = '1.1.3'
24+
kotlin_version = '1.3.21'
25+
leanback_version = '1.1.0-alpha01'
26+
material_version = '1.1.0-alpha05'
27+
support_lib_version = '1.0.0-beta01'
2528
}
2629

2730
repositories {
2831
google()
2932
jcenter()
3033
}
3134
dependencies {
32-
classpath 'com.android.tools.build:gradle:3.1.3'
35+
classpath 'com.android.tools.build:gradle:3.3.2'
3336
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
3437

3538
// NOTE: Do not place your application dependencies here; they belong

‎gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@
3131
# This option should only be used with decoupled projects. More details, visit
3232
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
3333
# org.gradle.parallel=true
34+
android.enableJetifier=true
35+
android.useAndroidX=true

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

‎mediacontroller/build.gradle‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ apply plugin: 'kotlin-android'
1919
apply plugin: 'kotlin-android-extensions'
2020

2121
android {
22-
compileSdkVersion 27
23-
buildToolsVersion '27.0.3'
22+
compileSdkVersion 28
2423

2524
compileOptions {
2625
sourceCompatibility JavaVersion.VERSION_1_8
@@ -30,12 +29,12 @@ android {
3029
defaultConfig {
3130
applicationId "com.example.android.mediacontroller"
3231
minSdkVersion 17
33-
targetSdkVersion 27
32+
targetSdkVersion 28
3433
versionCode 1
3534
versionName "1.0"
3635

3736
vectorDrawables.useSupportLibrary = true
38-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
37+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3938

4039
}
4140
buildTypes {
@@ -47,11 +46,13 @@ android {
4746
}
4847

4948
dependencies {
50-
implementation "com.android.support:appcompat-v7:$support_lib_version"
51-
implementation "com.android.support:design:$support_lib_version"
52-
implementation "com.android.support:cardview-v7:$support_lib_version"
53-
implementation "com.android.support:leanback-v17:$support_lib_version"
54-
55-
implementation "com.android.support.constraint:constraint-layout:$constraint_layout_version"
5649
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
50+
51+
implementation "androidx.appcompat:appcompat:$app_compat_version"
52+
implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version"
53+
implementation "androidx.cardview:cardview:$support_lib_version"
54+
55+
implementation "androidx.leanback:leanback:$leanback_version"
56+
57+
implementation "com.google.android.material:material:$material_version"
5758
}

‎mediacontroller/src/main/java/com/example/android/mediacontroller/Action.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import android.content.Context;
2020
import android.net.Uri;
2121
import android.os.Bundle;
22-
import android.support.annotation.NonNull;
23-
import android.support.annotation.Nullable;
22+
import androidx.annotation.NonNull;
23+
import androidx.annotation.Nullable;
2424
import android.support.v4.media.session.MediaControllerCompat;
2525
import android.text.TextUtils;
2626
import android.util.Log;

‎mediacontroller/src/main/java/com/example/android/mediacontroller/BitmapUtils.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
import android.graphics.PorterDuff;
2323
import android.graphics.drawable.BitmapDrawable;
2424
import android.graphics.drawable.Drawable;
25-
import android.support.annotation.NonNull;
25+
26+
import androidx.annotation.NonNull;
2627

2728
/**
2829
* Utility class for {@link Bitmap}s.
@@ -86,7 +87,7 @@ public static Bitmap convertDrawable(@NonNull final Resources resources,
8687
}
8788

8889
/**
89-
* Creates a Material Design compliant {@link android.support.v7.widget.Toolbar} icon
90+
* Creates a Material Design compliant {@link androidx.appcompat.widget.Toolbar} icon
9091
* from a given full sized icon.
9192
*
9293
* @param resources Resources for the current {@link android.content.Context}.

‎mediacontroller/src/main/java/com/example/android/mediacontroller/LaunchActivity.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,22 @@
2727
import android.os.Build;
2828
import android.os.Build.VERSION_CODES;
2929
import android.os.Bundle;
30-
import android.support.annotation.NonNull;
31-
import android.support.annotation.Nullable;
32-
import android.support.design.widget.Snackbar;
33-
import android.support.v7.app.AppCompatActivity;
34-
import android.support.v7.widget.LinearLayoutManager;
35-
import android.support.v7.widget.RecyclerView;
36-
import android.support.v7.widget.Toolbar;
37-
import android.util.Log;
3830
import android.widget.Toast;
3931

4032
import com.example.android.mediacontroller.tasks.FindMediaAppsTask;
4133
import com.example.android.mediacontroller.tasks.FindMediaBrowserAppsTask;
4234
import com.example.android.mediacontroller.tasks.FindMediaSessionAppsTask;
4335
import com.example.android.mediacontroller.tasks.MediaAppControllerUtils;
36+
import com.google.android.material.snackbar.Snackbar;
4437

4538
import java.util.List;
4639

40+
import androidx.annotation.NonNull;
41+
import androidx.appcompat.app.AppCompatActivity;
42+
import androidx.appcompat.widget.Toolbar;
43+
import androidx.recyclerview.widget.LinearLayoutManager;
44+
import androidx.recyclerview.widget.RecyclerView;
45+
4746
/**
4847
* App entry point. Presents a list of apps that implement a MediaBrowser interface
4948
* (via a receiver that responds to the action "android.media.browse.MediaBrowserService").

‎mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppControllerActivity.java‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package com.example.android.mediacontroller;
1717

18+
import static java.util.Arrays.asList;
19+
1820
import android.app.Activity;
1921
import android.app.PendingIntent;
2022
import android.content.Context;
@@ -28,28 +30,13 @@
2830
import android.net.Uri;
2931
import android.os.Bundle;
3032
import android.os.RemoteException;
31-
import android.support.annotation.IdRes;
32-
import android.support.annotation.NonNull;
33-
import android.support.annotation.Nullable;
34-
import android.support.design.widget.TabLayout;
35-
import android.support.v4.content.ContextCompat;
36-
import android.support.v4.content.res.ResourcesCompat;
37-
import android.support.v4.graphics.drawable.DrawableCompat;
3833
import android.support.v4.media.MediaBrowserCompat;
3934
import android.support.v4.media.MediaBrowserCompat.MediaItem;
4035
import android.support.v4.media.MediaMetadataCompat;
4136
import android.support.v4.media.RatingCompat;
4237
import android.support.v4.media.session.MediaControllerCompat;
4338
import android.support.v4.media.session.MediaSessionCompat;
4439
import android.support.v4.media.session.PlaybackStateCompat;
45-
import android.support.v4.view.PagerAdapter;
46-
import android.support.v4.view.ViewPager;
47-
import android.support.v7.app.ActionBar;
48-
import android.support.v7.app.AppCompatActivity;
49-
import android.support.v7.util.DiffUtil;
50-
import android.support.v7.widget.LinearLayoutManager;
51-
import android.support.v7.widget.RecyclerView;
52-
import android.support.v7.widget.Toolbar;
5340
import android.text.TextUtils;
5441
import android.util.Log;
5542
import android.util.SparseArray;
@@ -67,6 +54,24 @@
6754
import android.widget.Toast;
6855
import android.widget.ToggleButton;
6956

57+
import androidx.annotation.IdRes;
58+
import androidx.annotation.NonNull;
59+
import androidx.annotation.Nullable;
60+
import androidx.appcompat.app.ActionBar;
61+
import androidx.appcompat.app.AppCompatActivity;
62+
import androidx.appcompat.widget.Toolbar;
63+
import androidx.core.content.ContextCompat;
64+
import androidx.core.content.res.ResourcesCompat;
65+
import androidx.core.graphics.drawable.DrawableCompat;
66+
import androidx.media.MediaBrowserServiceCompat;
67+
import androidx.recyclerview.widget.DiffUtil;
68+
import androidx.recyclerview.widget.LinearLayoutManager;
69+
import androidx.recyclerview.widget.RecyclerView;
70+
import androidx.viewpager.widget.PagerAdapter;
71+
import androidx.viewpager.widget.ViewPager;
72+
73+
import com.google.android.material.tabs.TabLayout;
74+
7075
import java.util.ArrayList;
7176
import java.util.Collections;
7277
import java.util.Comparator;
@@ -78,10 +83,8 @@
7883
import java.util.Set;
7984
import java.util.Stack;
8085

81-
import static java.util.Arrays.asList;
82-
8386
/**
84-
* This class connects to a {@link android.support.v4.media.MediaBrowserServiceCompat}
87+
* This class connects to a {@link MediaBrowserServiceCompat}
8588
* in order to get a {@link MediaControllerCompat}.
8689
* Buttons are displayed on screen so that the user can exercise
8790
* the {@link android.support.v4.media.session.MediaSessionCompat.Callback}

‎mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppDetails.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import android.os.Build;
2929
import android.os.Parcel;
3030
import android.os.Parcelable;
31-
import android.support.annotation.Nullable;
32-
import android.support.annotation.RequiresApi;
33-
import android.support.v4.media.MediaBrowserServiceCompat;
31+
import androidx.annotation.Nullable;
32+
import androidx.annotation.RequiresApi;
33+
import androidx.media.MediaBrowserServiceCompat;
3434
import android.support.v4.media.session.MediaSessionCompat;
3535

3636
import java.util.List;

‎mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppListAdapter.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package com.example.android.mediacontroller;
1717

18-
import android.support.annotation.LayoutRes;
19-
import android.support.annotation.NonNull;
20-
import android.support.annotation.Nullable;
21-
import android.support.annotation.StringRes;
22-
import android.support.v7.util.DiffUtil;
23-
import android.support.v7.widget.RecyclerView;
24-
import android.support.v7.widget.RecyclerView.ViewHolder;
18+
import androidx.annotation.LayoutRes;
19+
import androidx.annotation.NonNull;
20+
import androidx.annotation.Nullable;
21+
import androidx.annotation.StringRes;
22+
import androidx.recyclerview.widget.DiffUtil;
23+
import androidx.recyclerview.widget.RecyclerView;
24+
import androidx.recyclerview.widget.RecyclerView.ViewHolder;
2525
import android.view.LayoutInflater;
2626
import android.view.View;
2727
import android.view.ViewGroup;

0 commit comments

Comments
 (0)