diff --git a/app/src/main/java/org/tasks/injection/ActivityComponent.java b/app/src/main/java/org/tasks/injection/ActivityComponent.java
index bee261374..e4fa92167 100644
--- a/app/src/main/java/org/tasks/injection/ActivityComponent.java
+++ b/app/src/main/java/org/tasks/injection/ActivityComponent.java
@@ -1,5 +1,6 @@
 package org.tasks.injection;
 
+import androidx.annotation.NonNull;
 import com.todoroo.astrid.activity.BeastModePreferences;
 import com.todoroo.astrid.activity.MainActivity;
 import com.todoroo.astrid.activity.ShareLinkActivity;
@@ -8,7 +9,6 @@ import com.todoroo.astrid.core.CustomFilterActivity;
 import com.todoroo.astrid.gcal.CalendarReminderActivity;
 import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity;
 import dagger.Subcomponent;
-import org.jetbrains.annotations.NotNull;
 import org.tasks.activities.CalendarSelectionActivity;
 import org.tasks.activities.CameraActivity;
 import org.tasks.activities.ColorPickerActivity;
@@ -32,10 +32,10 @@ import org.tasks.files.MyFilePickerActivity;
 import org.tasks.locale.ui.activity.TaskerCreateTaskActivity;
 import org.tasks.locale.ui.activity.TaskerSettingsActivity;
 import org.tasks.location.LocationPickerActivity;
-import org.tasks.preferences.ManageSpaceActivity;
 import org.tasks.preferences.AttributionActivity;
 import org.tasks.preferences.HelpAndFeedback;
 import org.tasks.preferences.MainPreferences;
+import org.tasks.preferences.ManageSpaceActivity;
 import org.tasks.preferences.NotificationPreferences;
 import org.tasks.preferences.SyncPreferences;
 import org.tasks.reminders.NotificationActivity;
@@ -99,7 +99,7 @@ public interface ActivityComponent {
 
   void inject(VoiceCommandActivity voiceCommandActivity);
 
-  void inject(@NotNull WidgetConfigActivity widgetConfigActivity);
+  void inject(@NonNull WidgetConfigActivity widgetConfigActivity);
 
   void inject(ShortcutConfigActivity shortcutConfigActivity);
 
@@ -141,11 +141,11 @@ public interface ActivityComponent {
 
   void inject(MainPreferences mainPreferences);
 
-  void inject(@NotNull HelpAndFeedback helpAndFeedback);
+  void inject(@NonNull HelpAndFeedback helpAndFeedback);
 
-  void inject(@NotNull NotificationPreferences notificationPreferences);
+  void inject(@NonNull NotificationPreferences notificationPreferences);
 
-  void inject(@NotNull ManageSpaceActivity manageSpaceActivity);
+  void inject(@NonNull ManageSpaceActivity manageSpaceActivity);
 
-  void inject(@NotNull SyncPreferences syncPreferences);
+  void inject(@NonNull SyncPreferences syncPreferences);
 }
diff --git a/app/src/main/java/org/tasks/injection/FragmentComponent.java b/app/src/main/java/org/tasks/injection/FragmentComponent.java
index 7fb3e404a..6515937d1 100644
--- a/app/src/main/java/org/tasks/injection/FragmentComponent.java
+++ b/app/src/main/java/org/tasks/injection/FragmentComponent.java
@@ -1,5 +1,6 @@
 package org.tasks.injection;
 
+import androidx.annotation.NonNull;
 import com.todoroo.astrid.activity.TaskEditFragment;
 import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.files.FilesControlSet;
@@ -10,7 +11,6 @@ import com.todoroo.astrid.ui.EditTitleControlSet;
 import com.todoroo.astrid.ui.HideUntilControlSet;
 import com.todoroo.astrid.ui.ReminderControlSet;
 import dagger.Subcomponent;
-import org.jetbrains.annotations.NotNull;
 import org.tasks.fragments.CommentBarFragment;
 import org.tasks.preferences.fragments.Advanced;
 import org.tasks.preferences.fragments.Backups;
@@ -75,27 +75,27 @@ public interface FragmentComponent {
 
   void inject(TaskListViewModel taskListViewModel);
 
-  void inject(@NotNull HelpAndFeedback helpAndFeedback);
+  void inject(@NonNull HelpAndFeedback helpAndFeedback);
 
-  void inject(@NotNull LookAndFeel lookAndFeel);
+  void inject(@NonNull LookAndFeel lookAndFeel);
 
-  void inject(@NotNull Synchronization synchronization);
+  void inject(@NonNull Synchronization synchronization);
 
-  void inject(@NotNull Debug debug);
+  void inject(@NonNull Debug debug);
 
-  void inject(@NotNull MainSettingsFragment mainSettingsFragment);
+  void inject(@NonNull MainSettingsFragment mainSettingsFragment);
 
-  void inject(@NotNull Backups backups);
+  void inject(@NonNull Backups backups);
 
-  void inject(@NotNull Advanced advanced);
+  void inject(@NonNull Advanced advanced);
 
-  void inject(@NotNull Notifications notifications);
+  void inject(@NonNull Notifications notifications);
 
-  void inject(@NotNull TaskDefaults taskDefaults);
+  void inject(@NonNull TaskDefaults taskDefaults);
 
-  void inject(@NotNull ScrollableWidget scrollableWidget);
+  void inject(@NonNull ScrollableWidget scrollableWidget);
 
-  void inject(@NotNull DashClock dashClock);
+  void inject(@NonNull DashClock dashClock);
 
-  void inject(@NotNull TaskerListNotification taskerListNotification);
+  void inject(@NonNull TaskerListNotification taskerListNotification);
 }