Fix AndroidJUnit4 imports

app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java

@@ -13,7 +13,7 @@ import static junit.framework.Assert.assertTrue;
 
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;

app/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java

@@ -21,7 +21,7 @@ import static org.tasks.date.DateTimeUtils.newDateTime;
 
 import android.content.res.Configuration;
 import android.util.DisplayMetrics;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.Locale;
 import org.junit.After;
 import org.junit.Before;

app/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java

@@ -6,7 +6,7 @@ import static junit.framework.Assert.assertEquals;
 import static org.tasks.Freeze.freezeAt;
 import static org.tasks.Freeze.thaw;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.Locale;
 import org.junit.After;
 import org.junit.Before;

app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmJobServiceTest.java

@@ -7,7 +7,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.tasks.makers.TaskMaker.REMINDER_LAST;
 import static org.tasks.makers.TaskMaker.newTask;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.Task;
 import javax.inject.Inject;

app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java

@@ -10,7 +10,7 @@ import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotSame;
 import static junit.framework.Assert.assertNull;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.common.collect.ImmutableList;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;

app/src/androidTest/java/com/todoroo/astrid/data/TaskTest.java

@@ -19,7 +19,7 @@ import static org.tasks.Freeze.thaw;
 import static org.tasks.date.DateTimeUtils.newDateTime;
 import static org.tasks.time.DateTimeUtils.currentTimeMillis;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.data.Task.Priority;
 import java.util.ArrayList;
 import java.util.TreeSet;

app/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java

@@ -11,7 +11,7 @@ import static org.tasks.makers.GtaskListMaker.REMOTE_ID;
 import static org.tasks.makers.GtaskListMaker.newGtaskList;
 import static org.tasks.makers.RemoteGtaskListMaker.newRemoteList;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.api.services.tasks.model.TaskList;
 import com.todoroo.astrid.service.TaskDeleter;
 import javax.inject.Inject;

app/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java

@@ -9,7 +9,7 @@ package com.todoroo.astrid.gtasks;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.Task;
 import javax.inject.Inject;

app/src/androidTest/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java

@@ -7,7 +7,7 @@ import static com.todoroo.astrid.gtasks.api.GtasksApiUtilities.unixTimeToGtasksD
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNull;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;

app/src/androidTest/java/com/todoroo/astrid/model/TaskTest.java

@@ -4,7 +4,7 @@ import static junit.framework.Assert.assertEquals;
 import static org.tasks.Freeze.freezeClock;
 import static org.tasks.time.DateTimeUtils.currentTimeMillis;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.Task;
 import javax.inject.Inject;

app/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java

@@ -9,7 +9,7 @@ package com.todoroo.astrid.repeats;
 import static junit.framework.Assert.assertEquals;
 import static org.tasks.date.DateTimeUtils.newDateTime;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.Weekday;

app/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java

@@ -4,7 +4,7 @@ import static com.todoroo.astrid.repeats.RepeatTaskHelper.computeNextDueDate;
 import static java.util.Arrays.asList;
 import static junit.framework.Assert.assertEquals;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.Weekday;

app/src/androidTest/java/com/todoroo/astrid/repeats/RepeatTaskHelperTest.java

@@ -13,7 +13,7 @@ import static org.tasks.makers.TaskMaker.RRULE;
 import static org.tasks.makers.TaskMaker.newTask;
 
 import android.annotation.SuppressLint;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.ical.values.RRule;
 import com.todoroo.astrid.alarms.AlarmService;
 import com.todoroo.astrid.dao.TaskDao;

app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java

@@ -8,7 +8,7 @@ package com.todoroo.astrid.service;
 
 import static junit.framework.Assert.assertEquals;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.Task.Priority;
 import com.todoroo.astrid.tags.TagService;

app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java

@@ -12,7 +12,7 @@ import static junit.framework.Assert.assertNotSame;
 import static junit.framework.Assert.assertTrue;
 import static org.tasks.date.DateTimeUtils.newDateTime;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.todoroo.astrid.data.Task;

app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java

@@ -2,7 +2,7 @@ package com.todoroo.astrid.subtasks;
 
 import static junit.framework.Assert.assertEquals;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.Task;
 import javax.inject.Inject;

app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java

@@ -1,6 +1,6 @@
 package com.todoroo.astrid.subtasks;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.Task;
 import javax.inject.Inject;

app/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java

@@ -2,7 +2,7 @@ package com.todoroo.astrid.sync;
 
 import static junit.framework.Assert.assertFalse;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.data.Task;
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/androidTest/java/org/tasks/caldav/AppleRemindersTests.java

@@ -3,7 +3,7 @@ package org.tasks.caldav;
 import static junit.framework.Assert.assertEquals;
 import static org.tasks.TestUtilities.vtodo;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.data.Task.Priority;
 import java.util.TimeZone;
 import org.junit.After;

app/src/androidTest/java/org/tasks/caldav/NextCloudTests.java

@@ -3,7 +3,7 @@ package org.tasks.caldav;
 import static junit.framework.Assert.assertEquals;
 import static org.tasks.TestUtilities.vtodo;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.data.Task.Priority;
 import java.util.TimeZone;
 import org.junit.After;

app/src/androidTest/java/org/tasks/caldav/SynologyTests.java

@@ -3,7 +3,7 @@ package org.tasks.caldav;
 import static junit.framework.Assert.assertTrue;
 import static org.tasks.TestUtilities.vtodo;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.TimeZone;
 import org.junit.After;
 import org.junit.Before;

app/src/androidTest/java/org/tasks/caldav/ThunderbirdTests.java

@@ -3,7 +3,7 @@ package org.tasks.caldav;
 import static junit.framework.Assert.assertEquals;
 import static org.tasks.TestUtilities.vtodo;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.data.Task.Priority;
 import java.util.TimeZone;
 import org.junit.After;

app/src/androidTest/java/org/tasks/data/DeletionDaoTests.java

@@ -2,7 +2,7 @@ package org.tasks.data;
 
 import static com.google.common.collect.Lists.newArrayList;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.common.collect.ContiguousSet;
 import com.google.common.collect.DiscreteDomain;
 import com.google.common.collect.Range;

app/src/androidTest/java/org/tasks/date/DateTimeUtilsTest.java

@@ -5,7 +5,7 @@ import static org.tasks.Freeze.freezeAt;
 import static org.tasks.date.DateTimeUtils.newDateUtc;
 import static org.tasks.time.DateTimeUtils.currentTimeMillis;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.TimeZone;
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/androidTest/java/org/tasks/gtasks/GoogleTaskSynchronizerTest.java

@@ -10,7 +10,7 @@ import static org.tasks.makers.TaskMaker.DUE_TIME;
 import static org.tasks.makers.TaskMaker.HIDE_TYPE;
 import static org.tasks.makers.TaskMaker.newTask;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.data.Task;
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.java

@@ -11,7 +11,7 @@ import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
 
 import android.net.Uri;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.Task;
 import java.io.File;

app/src/androidTest/java/org/tasks/jobs/BackupWorkTest.java

@@ -9,7 +9,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.stub;
 import static org.tasks.date.DateTimeUtils.newDate;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.io.File;
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/androidTest/java/org/tasks/jobs/NotificationQueueTest.java

@@ -15,7 +15,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 import static org.tasks.time.DateTimeUtils.currentTimeMillis;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;

app/src/androidTest/java/org/tasks/preferences/PreferenceTests.java

@@ -5,7 +5,7 @@ import static junit.framework.Assert.assertEquals;
 import static org.tasks.injection.TestModule.newPreferences;
 
 import android.annotation.SuppressLint;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;

app/src/androidTest/java/org/tasks/repeats/RepeatRuleToStringTest.java

@@ -3,7 +3,7 @@ package org.tasks.repeats;
 import static androidx.test.InstrumentationRegistry.getTargetContext;
 import static junit.framework.Assert.assertEquals;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.ical.values.RRule;
 import java.text.ParseException;
 import org.junit.Test;

app/src/androidTest/java/org/tasks/time/DateTimeTest.java

@@ -4,7 +4,7 @@ import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import org.junit.Test;