Upgrade to AndroidX and API 33

build.gradle

@@ -1,17 +1,19 @@
 buildscript {
     repositories {
-        jcenter()
+        gradlePluginPortal()
         google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:7.3.1'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        gradlePluginPortal()
         google()
+        mavenCentral()
     }
 }
 

caster/build.gradle

@@ -1,21 +1,17 @@
 apply plugin: 'com.android.library'
 
 ext {
-    supportVersion = '27.1.1'
-    castVersion = '15.0.1'
-    queryVersion = '0.25.9'
+    castVersion = '21.2.0'
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    namespace 'com.mradzinski.caster'
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 17
-        targetSdkVersion 27
-        versionCode 7
-        versionName '1.0.8'
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 33
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
@@ -26,21 +22,9 @@ android {
     }
 }
 
-configurations.all {
-    // Force the usage of the same support library version.
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        def requested = details.requested
-        if (requested.group == 'com.android.support') {
-            if (!requested.name.startsWith("multidex")) {
-                details.useVersion supportVersion
-            }
-        }
-    }
-}
-
 dependencies {
-    api "com.android.support:appcompat-v7:$supportVersion"
-    api "com.android.support:support-v4:$supportVersion"
-    api "com.android.support:mediarouter-v7:$supportVersion"
+    api 'androidx.appcompat:appcompat:1.5.1'
+    api 'androidx.legacy:legacy-support-v4:1.0.0'
+    api 'androidx.mediarouter:mediarouter:1.3.1'
     api "com.google.android.gms:play-services-cast-framework:$castVersion"
 }

caster/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.mradzinski.caster"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:label="@string/app_name"

caster/src/main/java/com/mradzinski/caster/CastOptionsProvider.java

@@ -12,13 +12,16 @@
 import java.util.Arrays;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 @SuppressWarnings("unused")
 // Class is used and being referenced in the AndroidManifest.xml as value for
 // com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME
 public class CastOptionsProvider implements OptionsProvider {
 
+    @NonNull
     @Override
-    public CastOptions getCastOptions(Context context) {
+    public CastOptions getCastOptions(@NonNull Context context) {
         CastOptions customCastOptions = Caster.customCastOptions;
         LaunchOptions customLaunchOptions = Caster.customLaunchOptions;
 
@@ -56,7 +59,7 @@ private List<String> createButtonActions() {
     }
 
     @Override
-    public List<SessionProvider> getAdditionalSessionProviders(Context context) {
+    public List<SessionProvider> getAdditionalSessionProviders(@NonNull Context context) {
         return null;
     }
 }

caster/src/main/java/com/mradzinski/caster/Caster.java

@@ -4,11 +4,6 @@
 import android.app.Application;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.support.v7.app.MediaRouteButton;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -35,6 +30,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.mediarouter.app.MediaRouteButton;
+
 /**
  * Core class of Caster. It manages buttons/widgets and gives access to the media player.
  */

caster/src/main/java/com/mradzinski/caster/CasterActivity.java

@@ -1,12 +1,13 @@
 package com.mradzinski.caster;
 
 import android.os.Bundle;
-import android.support.annotation.CallSuper;
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 
+import androidx.annotation.CallSuper;
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 /**
  * Extensible {@link AppCompatActivity}, which helps with setting widgets
  */

caster/src/main/java/com/mradzinski/caster/CasterNoOp.java

@@ -1,10 +1,11 @@
 package com.mradzinski.caster;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.MediaRouteButton;
 import android.view.Menu;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.mediarouter.app.MediaRouteButton;
+
 class CasterNoOp extends Caster {
     private CasterPlayer casterPlayer;
 

caster/src/main/java/com/mradzinski/caster/CasterPlayer.java

@@ -1,14 +1,16 @@
 package com.mradzinski.caster;
 
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.google.android.gms.cast.MediaInfo;
 import com.google.android.gms.cast.MediaLoadOptions;
 import com.google.android.gms.cast.framework.media.RemoteMediaClient;
 
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+@SuppressWarnings("unused")
 public class CasterPlayer {
     private static final String TAG = "Caster";
 

caster/src/main/java/com/mradzinski/caster/CasterPlayerNoOp.java

@@ -1,8 +1,9 @@
 package com.mradzinski.caster;
 
-import android.support.annotation.NonNull;
 import com.google.android.gms.cast.MediaInfo;
 
+import androidx.annotation.NonNull;
+
 class CasterPlayerNoOp extends CasterPlayer {
     @Override
     public void play() {

caster/src/main/java/com/mradzinski/caster/ExpandedControlsStyle.java

@@ -10,10 +10,10 @@
 
 package com.mradzinski.caster;
 
-import android.support.annotation.ColorInt;
-
 import java.io.Serializable;
 
+import androidx.annotation.ColorInt;
+
 public class ExpandedControlsStyle implements Serializable {
     @ColorInt private int seekbarLineColor;
     @ColorInt private int seekbarThumbColor;

caster/src/main/java/com/mradzinski/caster/MediaData.java

@@ -1,16 +1,19 @@
 package com.mradzinski.caster;
 
 import android.net.Uri;
-import android.support.annotation.IntDef;
 import android.text.TextUtils;
+
 import com.google.android.gms.cast.MediaInfo;
 import com.google.android.gms.cast.MediaMetadata;
 import com.google.android.gms.common.images.WebImage;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.IntDef;
+
 /**
  * Media information class
  */

caster/src/main/res/menu/caster_discovery.xml

@@ -4,6 +4,6 @@
     <item
         android:id="@+id/caster_media_route_menu_item"
         android:title="@android:string/untitled"
-        app:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
+        app:actionProviderClass="androidx.mediarouter.app.MediaRouteActionProvider"
         app:showAsAction="always" />
 </menu>

example/build.gradle

@@ -1,16 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    namespace 'com.mradzinski.casterexample'
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.mradzinski.casterexample"
         minSdkVersion 17
-        targetSdkVersion 27
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {

example/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mradzinski.casterexample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -12,7 +11,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.mradzinski.casterexample.MainActivity">
+        <activity
+            android:name="com.mradzinski.casterexample.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

example/src/main/java/com/mradzinski/casterexample/MainActivity.java

@@ -1,17 +1,17 @@
 package com.mradzinski.casterexample;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.MediaRouteButton;
 import android.util.Log;
 import android.view.Menu;
-import android.view.View;
 import android.widget.Button;
 
 import com.mradzinski.caster.Caster;
 import com.mradzinski.caster.ExpandedControlsStyle;
 import com.mradzinski.caster.MediaData;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.mediarouter.app.MediaRouteButton;
+
 public class MainActivity extends AppCompatActivity {
     private static final String VIMEO_URL = "Your M3U URL goes here :)";
 
@@ -43,19 +43,11 @@ private void setUpPlayButton() {
         playButton = findViewById(R.id.button_play);
         resumeButton = findViewById(R.id.button_resume);
 
-        playButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                caster.getPlayer().loadMediaAndPlay(createSampleMediaData());
-            }
-        });
+        playButton.setOnClickListener(v -> caster.getPlayer().loadMediaAndPlay(createSampleMediaData()));
 
-        resumeButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (caster.getPlayer().isPaused()) {
-                    caster.getPlayer().togglePlayPause();
-                }
+        resumeButton.setOnClickListener(v -> {
+            if (caster.getPlayer().isPaused()) {
+                caster.getPlayer().togglePlayPause();
             }
         });
 

gradle.properties

@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Feb 14 11:27:03 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip