From f4ae87fffe51221c6004c3b273ce00f8b3bd695c Mon Sep 17 00:00:00 2001 From: Nite Date: Sun, 26 Apr 2020 12:05:28 +0200 Subject: [PATCH] Migrated to Androidx --- .../java/com/mobeta/android/dslv/DragSortCursorAdapter.java | 2 +- dependencies.gradle | 6 +++--- gradle.properties | 2 ++ gradle_scripts/android-module-bootstrap.gradle | 2 +- ultrasonic/build.gradle | 2 ++ .../java/org/moire/ultrasonic/activity/HelpActivity.java | 2 +- .../java/org/moire/ultrasonic/activity/ResultActivity.java | 2 +- .../moire/ultrasonic/activity/ServerSettingsActivity.java | 6 +++--- .../org/moire/ultrasonic/activity/SettingsActivity.java | 2 +- .../org/moire/ultrasonic/activity/SubsonicTabActivity.java | 2 +- .../moire/ultrasonic/fragment/ServerSettingsFragment.java | 2 +- .../org/moire/ultrasonic/fragment/SettingsFragment.java | 2 +- .../org/moire/ultrasonic/service/DownloadServiceImpl.java | 4 ++-- .../java/org/moire/ultrasonic/service/RESTMusicService.java | 6 +++--- .../main/java/org/moire/ultrasonic/view/ArtistAdapter.java | 4 ++-- .../main/java/org/moire/ultrasonic/view/GenreAdapter.java | 4 ++-- .../org/moire/ultrasonic/view/PodcastsChannelsAdapter.java | 2 +- 17 files changed, 28 insertions(+), 24 deletions(-) diff --git a/core/library/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java b/core/library/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java index 267c6f86..9e14059b 100644 --- a/core/library/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java +++ b/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; /** diff --git a/dependencies.gradle b/dependencies.gradle index 94550ef3..2a990d89 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -41,9 +41,9 @@ ext.gradlePlugins = [ ] ext.androidSupport = [ - support : "com.android.support:support-v4:$versions.androidSupport", - design : "com.android.support:design:$versions.androidSupport", - annotations : "com.android.support:support-annotations:$versions.androidSupport" + support : 'androidx.legacy:legacy-support-v4:1.0.0', + design : 'com.google.android.material:material:1.0.0', + annotations: "com.android.support:support-annotations:$versions.androidSupport" ] ext.other = [ diff --git a/gradle.properties b/gradle.properties index c56ddc2f..71151f17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,3 +8,5 @@ kotlin.caching.enabled=true kotlin.incremental.usePreciseJavaTracking=true android.enableBuildCache=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/gradle_scripts/android-module-bootstrap.gradle b/gradle_scripts/android-module-bootstrap.gradle index 98fb9516..de168dfb 100644 --- a/gradle_scripts/android-module-bootstrap.gradle +++ b/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 } diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle index 8b7ddc31..5a9821ca 100644 --- a/ultrasonic/build.gradle +++ b/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 diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java index 994faf16..a664899f 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java +++ b/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; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java index 4d956892..9dc9f7f5 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java +++ b/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; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ServerSettingsActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ServerSettingsActivity.java index 8b36dce3..9b4027e1 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ServerSettingsActivity.java +++ b/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 android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.view.MenuItem; import org.moire.ultrasonic.R; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SettingsActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SettingsActivity.java index d96436b9..cb147e63 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SettingsActivity.java +++ b/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; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java index 9423d117..72377dff 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java +++ b/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; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/ServerSettingsFragment.java b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/ServerSettingsFragment.java index f2512ba9..58e26778 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/ServerSettingsFragment.java +++ b/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; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java index 204cb880..70b3b9b0 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java +++ b/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; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceImpl.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceImpl.java index 59c1f8af..495d7678 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceImpl.java +++ b/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 android.support.v4.app.NotificationManagerCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; import android.util.Log; import android.view.View; import android.widget.RemoteViews; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java index cd45a62e..e090caa2 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java +++ b/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 android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.text.TextUtils; import android.util.Log; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java index 67796a03..d2071565 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java +++ b/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 android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java index 12a21f3f..f3c7e34a 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java +++ b/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 android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/view/PodcastsChannelsAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/PodcastsChannelsAdapter.java index 17749735..28ac4763 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/view/PodcastsChannelsAdapter.java +++ b/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;