6 files changed, 5 insertions, 31 deletions
diff --git a/app/build.gradle b/app/build.gradle
index c4265f995..06b387e7b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -125,8 +125,7 @@ dependencies {
     implementation 'com.github.xabaras:RecyclerViewSwipeDecorator:1.3'
 
     // Non-free dependencies:
-    playImplementation 'com.google.android.play:core:1.8.0'
-    compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion"
+    playImplementation "com.google.android.play:review:2.0.1"
 
     androidTestImplementation "org.awaitility:awaitility:$awaitilityVersion"
     androidTestImplementation 'com.nanohttpd:nanohttpd:2.1.1'
diff --git a/app/src/play/java/de/danoeh/antennapod/dialog/RatingDialog.java b/app/src/play/java/de/danoeh/antennapod/dialog/RatingDialog.java
index 23b74b07e..c38ae2659 100644
--- a/app/src/play/java/de/danoeh/antennapod/dialog/RatingDialog.java
+++ b/app/src/play/java/de/danoeh/antennapod/dialog/RatingDialog.java
@@ -11,10 +11,10 @@ import android.util.Log;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.TimeUnit;
 
+import com.google.android.gms.tasks.Task;
 import com.google.android.play.core.review.ReviewInfo;
 import com.google.android.play.core.review.ReviewManager;
 import com.google.android.play.core.review.ReviewManagerFactory;
-import com.google.android.play.core.tasks.Task;
 
 import de.danoeh.antennapod.BuildConfig;
 
diff --git a/build.gradle b/build.gradle
index ebaac9d9e..dce2b1a10 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,9 +33,6 @@ project.ext {
     rxAndroidVersion = "2.1.1"
     rxJavaVersion = "2.2.2"
 
-    // Google Play build
-    wearableSupportVersion = "2.6.0"
-
     //Tests
     awaitilityVersion = "3.1.6"
     junitVersion = "4.13"
diff --git a/core/build.gradle b/core/build.gradle
index b864c4455..b36d87129 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -67,10 +67,6 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
     implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
 
-    // Non-free dependencies:
-    playApi "com.google.android.support:wearable:$wearableSupportVersion"
-    compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion"
-
     testImplementation "androidx.test:core:$testCoreVersion"
     testImplementation "org.awaitility:awaitility:$awaitilityVersion"
     testImplementation "junit:junit:$junitVersion"
diff --git a/core/src/free/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java b/core/src/free/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java
deleted file mode 100644
index 5998a1e2f..000000000
--- a/core/src/free/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package de.danoeh.antennapod.core.service.playback;
-
-import android.support.v4.media.session.MediaSessionCompat;
-import android.support.v4.media.session.PlaybackStateCompat;
-
-class WearMediaSession {
-    /**
-     * Take a custom action builder and add no extras, because this is not the Play version of the app.
-     */
-    static void addWearExtrasToAction(PlaybackStateCompat.CustomAction.Builder actionBuilder) {
-        // no-op
-    }
-
-    static void mediaSessionSetExtraForWear(MediaSessionCompat mediaSession) {
-        // no-op
-    }
-}
diff --git a/core/src/play/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java
index 47881da0b..854562e2c 100644
--- a/core/src/play/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/WearMediaSession.java
@@ -3,7 +3,6 @@ package de.danoeh.antennapod.core.service.playback;
 import android.os.Bundle;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
-import android.support.wearable.media.MediaControlConstants;
 
 public class WearMediaSession {
     /**
@@ -12,14 +11,14 @@ public class WearMediaSession {
      */
     static void addWearExtrasToAction(PlaybackStateCompat.CustomAction.Builder actionBuilder) {
         Bundle actionExtras = new Bundle();
-        actionExtras.putBoolean(MediaControlConstants.EXTRA_CUSTOM_ACTION_SHOW_ON_WEAR, true);
+        actionExtras.putBoolean("android.support.wearable.media.extra.CUSTOM_ACTION_SHOW_ON_WEAR", true);
         actionBuilder.setExtras(actionExtras);
     }
 
     static void mediaSessionSetExtraForWear(MediaSessionCompat mediaSession) {
         Bundle sessionExtras = new Bundle();
-        sessionExtras.putBoolean(MediaControlConstants.EXTRA_RESERVE_SLOT_SKIP_TO_PREVIOUS, false);
-        sessionExtras.putBoolean(MediaControlConstants.EXTRA_RESERVE_SLOT_SKIP_TO_NEXT, false);
+        sessionExtras.putBoolean("android.support.wearable.media.extra.RESERVE_SLOT_SKIP_TO_PREVIOUS", false);
+        sessionExtras.putBoolean("android.support.wearable.media.extra.RESERVE_SLOT_SKIP_TO_NEXT", false);
         mediaSession.setExtras(sessionExtras);
     }
 }