Migrate to AndroidX (#544)

android/uhabits-core/build.gradle

@@ -10,7 +10,7 @@ dependencies {
     compileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
     compileOnly "com.google.dagger:dagger:$DAGGER_VERSION"
 
-    implementation "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION"
+    implementation 'androidx.annotation:annotation:1.0.0'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
     implementation 'org.apache.commons:commons-lang3:3.5'
     implementation 'com.google.code.gson:gson:2.8.5'

android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.commands;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.commands;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/Command.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.commands;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import com.google.gson.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandParser.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.commands;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import com.google.gson.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandRunner.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.commands;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.*;
 import org.isoron.uhabits.core.tasks.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateHabitCommand.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.commands;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import com.google.auto.factory.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.commands;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.commands;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/EditHabitCommand.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.commands;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import com.google.auto.factory.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ToggleRepetitionCommand.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.commands;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.commands;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Cursor.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.database;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 public interface Cursor extends AutoCloseable
 {

android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/DatabaseOpener.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.database;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import java.io.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/MigrationHelper.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.database;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import java.io.*;
 import java.util.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Repository.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.database;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.apache.commons.lang3.*;
 import org.apache.commons.lang3.tuple.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/AbstractImporter.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.io;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/GenericImporter.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.io;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.io;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import com.opencsv.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitsCSVExporter.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.io;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.utils.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/LoopDBImporter.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.io;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.io;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.io;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.apache.commons.lang3.builder.*;
 import org.isoron.uhabits.core.utils.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.apache.commons.lang3.builder.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import com.opencsv.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Reminder.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.apache.commons.lang3.builder.*;
 import org.isoron.uhabits.core.utils.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/RepetitionList.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.utils.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.utils.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/StreakList.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.utils.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryCheckmarkList.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models.memory;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models.memory;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryRepetitionList.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models.memory;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryScoreList.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models.memory;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryStreakList.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models.memory;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java

@@ -21,7 +21,7 @@
 
 package org.isoron.uhabits.core.models.sqlite;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionList.java

@@ -21,8 +21,8 @@
 
 package org.isoron.uhabits.core.models.sqlite;
 
-import android.support.annotation.*;
-import android.support.annotation.Nullable;
+import androidx.annotation.*;
+import androidx.annotation.Nullable;
 
 import org.isoron.uhabits.core.database.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.preferences;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.ui.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/PropertiesStorage.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.preferences;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import java.io.*;
 import java.util.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/reminders/ReminderScheduler.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.reminders;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.*;
 import org.isoron.uhabits.core.commands.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/ExportCSVTask.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.tasks;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import com.google.auto.factory.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/Task.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.tasks;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 public interface Task
 {

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.ui;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.*;
 import org.isoron.uhabits.core.commands.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.ui;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.preferences.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/about/AboutBehavior.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.ui.screens.about;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.preferences.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.ui.screens.habits.list;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.*;
 import org.isoron.uhabits.core.commands.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HintList.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.ui.screens.habits.list;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import com.google.auto.factory.*;
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.ui.screens.habits.list;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.ui.screens.habits.list;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.preferences.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.ui.screens.habits.list;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.ui.screens.habits.show;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.ui.screens.habits.show;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.ui.widgets;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.core.models.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateFormats.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.utils;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import java.text.*;
 import java.util.*;

android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.utils;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.models.*;
 import org.jetbrains.annotations.*;

android/uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.apache.commons.io.*;
 import org.isoron.uhabits.core.commands.*;

android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CommandParserTest.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.commands;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.hamcrest.*;
 import org.isoron.uhabits.core.*;

android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/RepetitionListTest.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.*;
 import org.isoron.uhabits.core.utils.*;

android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteRepetitionListTest.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.models.sqlite;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.*;
 import org.isoron.uhabits.core.database.*;

android/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PreferencesTest.java

@@ -19,7 +19,7 @@
 
 package org.isoron.uhabits.core.preferences;
 
-import android.support.annotation.*;
+import androidx.annotation.*;
 
 import org.isoron.uhabits.core.*;
 import org.isoron.uhabits.core.models.*;