Migrated to Androidx

core/library/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java

@@ -7,7 +7,7 @@ import android.database.Cursor;
 import android.util.SparseIntArray;
 import android.view.View;
 import android.view.ViewGroup;
-import android.support.v4.widget.CursorAdapter;
+import androidx.cursoradapter.widget.CursorAdapter;
 
 
 /**

dependencies.gradle

@@ -41,9 +41,9 @@ ext.gradlePlugins = [
 ]
 
 ext.androidSupport = [
-        support     : "com.android.support:support-v4:$versions.androidSupport",
+        support    : 'androidx.legacy:legacy-support-v4:1.0.0',
-        design      : "com.android.support:design:$versions.androidSupport",
+        design     : 'com.google.android.material:material:1.0.0',
-        annotations : "com.android.support:support-annotations:$versions.androidSupport"
+        annotations: "com.android.support:support-annotations:$versions.androidSupport"
 ]
 
 ext.other = [

gradle.properties

@@ -8,3 +8,5 @@ kotlin.caching.enabled=true
 kotlin.incremental.usePreciseJavaTracking=true
 
 android.enableBuildCache=true
+android.useAndroidX=true
+android.enableJetifier=true

gradle_scripts/android-module-bootstrap.gradle

@@ -12,7 +12,7 @@ android {
     compileSdkVersion versions.compileSdk
 
     defaultConfig {
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
     }

ultrasonic/build.gradle

@@ -13,6 +13,7 @@ android {
 
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
+        multiDexEnabled true
 
         resConfigs "de", "en", "es", "fr", "hu", "nl", "pl", "pt", "pt-rBR"
     }
@@ -64,6 +65,7 @@ dependencies {
 
     implementation androidSupport.support
     implementation androidSupport.design
+    implementation 'com.android.support:multidex:1.0.3'
 
     implementation other.kotlinStdlib
     implementation other.koinAndroid

ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java

@@ -21,7 +21,7 @@ package org.moire.ultrasonic.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.view.View;

ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java

@@ -2,7 +2,7 @@ package org.moire.ultrasonic.activity;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import org.moire.ultrasonic.util.Constants;
 import org.moire.ultrasonic.util.Util;

ultrasonic/src/main/java/org/moire/ultrasonic/activity/ServerSettingsActivity.java

@@ -1,9 +1,9 @@
 package org.moire.ultrasonic.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 
 import org.moire.ultrasonic.R;

ultrasonic/src/main/java/org/moire/ultrasonic/activity/SettingsActivity.java

@@ -19,7 +19,7 @@
 package org.moire.ultrasonic.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 
 import org.moire.ultrasonic.R;
 import org.moire.ultrasonic.fragment.SettingsFragment;

ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java

@@ -30,7 +30,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.util.Log;
 import android.view.*;
 import android.view.View.OnClickListener;

ultrasonic/src/main/java/org/moire/ultrasonic/fragment/ServerSettingsFragment.java

@@ -8,7 +8,7 @@ import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 

ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java

@@ -6,7 +6,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.preference.*;
 import android.provider.SearchRecentSuggestions;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import org.koin.java.standalone.KoinJavaComponent;

ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceImpl.java

@@ -36,8 +36,8 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.PowerManager;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
 import android.util.Log;
 import android.view.View;
 import android.widget.RemoteViews;

ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java

@@ -20,9 +20,9 @@ package org.moire.ultrasonic.service;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.text.TextUtils;
 import android.util.Log;
 

ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java

@@ -19,8 +19,8 @@
 package org.moire.ultrasonic.view;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java

@@ -19,8 +19,8 @@
 package org.moire.ultrasonic.view;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

ultrasonic/src/main/java/org/moire/ultrasonic/view/PodcastsChannelsAdapter.java

@@ -1,7 +1,7 @@
 package org.moire.ultrasonic.view;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;