Skip to content

Commit 5ff73e8

Browse files
SimonStefanDinosaurierRex
SimonStefan
authored and
DinosaurierRex
committed
AndroidX - automatic conversion
1 parent 26687a3 commit 5ff73e8

File tree

539 files changed

+1789
-1778
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

539 files changed

+1789
-1778
lines changed

‎catroid/build.gradle

+12-14
Original file line numberDiff line numberDiff line change
@@ -318,16 +318,14 @@ dependencies {
318318
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
319319

320320
// Support libraries
321-
implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
322-
implementation "com.android.support:mediarouter-v7:$supportLibraryVersion"
323-
implementation "com.android.support:cardview-v7:$supportLibraryVersion"
324-
implementation "com.android.support:design:$supportLibraryVersion"
325-
implementation "com.android.support:customtabs:$supportLibraryVersion"
326-
implementation "com.android.support:exifinterface:$supportLibraryVersion"
327-
implementation "com.android.support:support-v4:$supportLibraryVersion"
321+
implementation 'androidx.appcompat:appcompat:1.0.0'
322+
implementation 'androidx.mediarouter:mediarouter:1.0.0'
323+
implementation 'androidx.cardview:cardview:1.0.0'
324+
implementation 'com.google.android.material:material:1.0.0'
325+
implementation 'androidx.browser:browser:1.0.0'
328326

329-
implementation "com.android.support.test.espresso:espresso-idling-resource:$espressoVersion"
330-
implementation 'com.android.support:multidex:1.0.3'
327+
implementation 'androidx.test.espresso:espresso-idling-resource:3.1.0'
328+
implementation 'androidx.multidex:multidex:2.0.0'
331329

332330
// Dagger
333331
implementation 'com.google.dagger:dagger:2.21'
@@ -386,7 +384,7 @@ dependencies {
386384
androidTestImplementation ('tools.fastlane:screengrab:1.1.0'){
387385
exclude group: 'com.android.support'
388386
}
389-
androidTestImplementation ("com.android.support.test.espresso:espresso-web:$espressoVersion") {
387+
androidTestImplementation ('androidx.test.espresso:espresso-web:3.1.0') {
390388
exclude group: 'com.android.support'
391389
}
392390

@@ -411,10 +409,10 @@ dependencies {
411409
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.2.0'
412410
androidTestImplementation "org.mockito:mockito-core:$mockitoVersion"
413411

414-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
415-
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
416-
androidTestImplementation "com.android.support.test.espresso:espresso-contrib:$espressoVersion"
417-
androidTestImplementation "com.android.support.test.espresso:espresso-intents:$espressoVersion"
412+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
413+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
414+
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0'
415+
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0'
418416

419417
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
420418
}

‎catroid/src/androidTest/java/org/catrobat/catroid/catrobattestrunner/CatrobatTestRunner.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@
2424

2525
import android.app.Instrumentation;
2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.rule.ActivityTestRule;
27+
import androidx.test.espresso.UiController;
28+
import androidx.test.espresso.ViewAction;
29+
import androidx.test.rule.ActivityTestRule;
30+
import android.view.View;
2831

2932
import org.catrobat.catroid.common.Constants;
3033
import org.catrobat.catroid.io.StorageOperations;
@@ -45,6 +48,11 @@
4548
import java.util.ArrayList;
4649
import java.util.List;
4750

51+
import static androidx.test.espresso.Espresso.onView;
52+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
53+
import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
54+
55+
import static junit.framework.Assert.assertEquals;
4856
import static junit.framework.Assert.fail;
4957
import static junit.framework.TestCase.assertTrue;
5058

‎catroid/src/androidTest/java/org/catrobat/catroid/catrobattestrunner/CatrobatTestRunnerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
package org.catrobat.catroid.catrobattestrunner;
2525

26-
import android.support.test.runner.AndroidJUnit4;
26+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2727

2828
import org.junit.Rule;
2929
import org.junit.Test;

‎catroid/src/androidTest/java/org/catrobat/catroid/common/bluetooth/ConnectionDataLogger.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package org.catrobat.catroid.common.bluetooth;
2424

25-
import android.support.annotation.VisibleForTesting;
25+
import androidx.annotation.VisibleForTesting;
2626

2727
import com.google.common.base.Stopwatch;
2828

‎catroid/src/androidTest/java/org/catrobat/catroid/runner/UiTestApplicationRunner.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import android.app.Application
2727
import android.content.Context
2828
import android.os.Bundle
2929
import android.os.StrictMode
30-
import android.support.test.runner.AndroidJUnitRunner
30+
import androidx.test.runner.AndroidJUnitRunner
3131
import org.catrobat.catroid.UiTestCatroidApplication
3232

3333
class UiTestApplicationRunner : AndroidJUnitRunner() {

‎catroid/src/androidTest/java/org/catrobat/catroid/screenshots/catroid/ScreenshotsForAppStore.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525

2626
import android.preference.PreferenceManager;
2727
import android.support.test.InstrumentationRegistry;
28-
import android.support.test.espresso.contrib.RecyclerViewActions;
29-
import android.support.test.espresso.web.webdriver.Locator;
30-
import android.support.test.rule.ActivityTestRule;
31-
import android.support.test.runner.AndroidJUnit4;
28+
import androidx.test.espresso.contrib.RecyclerViewActions;
29+
import androidx.test.espresso.web.webdriver.Locator;
30+
import androidx.test.rule.ActivityTestRule;
31+
import androidx.test.ext.junit.runners.AndroidJUnit4;
3232

3333
import org.catrobat.catroid.R;
3434
import org.catrobat.catroid.ui.MainMenuActivity;
@@ -43,17 +43,17 @@
4343
import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
4444
import tools.fastlane.screengrab.locale.LocaleTestRule;
4545

46-
import static android.support.test.espresso.Espresso.onData;
47-
import static android.support.test.espresso.Espresso.onView;
48-
import static android.support.test.espresso.action.ViewActions.click;
49-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
50-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
51-
import static android.support.test.espresso.matcher.ViewMatchers.isRoot;
52-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
53-
import static android.support.test.espresso.matcher.ViewMatchers.withText;
54-
import static android.support.test.espresso.web.sugar.Web.onWebView;
55-
import static android.support.test.espresso.web.webdriver.DriverAtoms.findElement;
56-
import static android.support.test.espresso.web.webdriver.DriverAtoms.webClick;
46+
import static androidx.test.espresso.Espresso.onData;
47+
import static androidx.test.espresso.Espresso.onView;
48+
import static androidx.test.espresso.action.ViewActions.click;
49+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
50+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
51+
import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
52+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
53+
import static androidx.test.espresso.matcher.ViewMatchers.withText;
54+
import static androidx.test.espresso.web.sugar.Web.onWebView;
55+
import static androidx.test.espresso.web.webdriver.DriverAtoms.findElement;
56+
import static androidx.test.espresso.web.webdriver.DriverAtoms.webClick;
5757

5858
import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
5959
import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.FORMULA_EDITOR_TEXT_FIELD_MATCHER;

‎catroid/src/androidTest/java/org/catrobat/catroid/screenshots/lunaandcat/ScreenshotsForAppStore.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626
import android.preference.PreferenceManager;
2727
import android.support.test.InstrumentationRegistry;
28-
import android.support.test.espresso.contrib.RecyclerViewActions;
29-
import android.support.test.rule.ActivityTestRule;
30-
import android.support.test.runner.AndroidJUnit4;
28+
import androidx.test.espresso.contrib.RecyclerViewActions;
29+
import androidx.test.rule.ActivityTestRule;
30+
import androidx.test.ext.junit.runners.AndroidJUnit4;
3131

3232
import org.catrobat.catroid.R;
3333
import org.catrobat.catroid.ui.MainMenuActivity;
@@ -42,14 +42,14 @@
4242
import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
4343
import tools.fastlane.screengrab.locale.LocaleTestRule;
4444

45-
import static android.support.test.espresso.Espresso.onData;
46-
import static android.support.test.espresso.Espresso.onView;
47-
import static android.support.test.espresso.action.ViewActions.click;
48-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
49-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
50-
import static android.support.test.espresso.matcher.ViewMatchers.isRoot;
51-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
52-
import static android.support.test.espresso.matcher.ViewMatchers.withText;
45+
import static androidx.test.espresso.Espresso.onData;
46+
import static androidx.test.espresso.Espresso.onView;
47+
import static androidx.test.espresso.action.ViewActions.click;
48+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
49+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
50+
import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
51+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
52+
import static androidx.test.espresso.matcher.ViewMatchers.withText;
5353

5454
import static org.catrobat.catroid.uiespresso.content.brick.utils.BrickDataInteractionWrapper.onBrickAtPosition;
5555
import static org.catrobat.catroid.uiespresso.formulaeditor.utils.FormulaEditorWrapper.FORMULA_EDITOR_TEXT_FIELD_MATCHER;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/ProjectManagerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import android.content.Context;
2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828

2929
import org.catrobat.catroid.ProjectManager;
3030
import org.catrobat.catroid.UiTestCatroidApplication;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/common/DefaultProjectHandlerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
package org.catrobat.catroid.test.common;
2424

2525
import android.support.test.InstrumentationRegistry;
26-
import android.support.test.runner.AndroidJUnit4;
26+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2727

2828
import org.catrobat.catroid.common.DefaultProjectHandler;
2929
import org.catrobat.catroid.content.Project;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/common/LookDataTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package org.catrobat.catroid.test.common;
2525

2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828

2929
import org.catrobat.catroid.common.Constants;
3030
import org.catrobat.catroid.common.LookData;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/common/ServiceProviderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package org.catrobat.catroid.test.common;
2424

25-
import android.support.test.runner.AndroidJUnit4;
25+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2626

2727
import org.catrobat.catroid.bluetooth.base.BluetoothDeviceService;
2828
import org.catrobat.catroid.common.CatroidService;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/GoToTouchPositionActionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
package org.catrobat.catroid.test.content.actions;
2525

26-
import android.support.test.runner.AndroidJUnit4;
26+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2727

2828
import com.badlogic.gdx.scenes.scene2d.Action;
2929

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/PlaySoundActionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import android.media.MediaPlayer;
2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828

2929
import com.badlogic.gdx.scenes.scene2d.Action;
3030

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/SetNfcTagActionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import android.nfc.FormatException;
2626
import android.nfc.NdefMessage;
2727
import android.support.test.InstrumentationRegistry;
28-
import android.support.test.runner.AndroidJUnit4;
28+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2929

3030
import org.catrobat.catroid.ProjectManager;
3131
import org.catrobat.catroid.common.BrickValues;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/SetRotationStyleActionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package org.catrobat.catroid.test.content.actions;
2424

25-
import android.support.test.runner.AndroidJUnit4;
25+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2626

2727
import com.badlogic.gdx.scenes.scene2d.Action;
2828

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StitchActionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package org.catrobat.catroid.test.content.actions;
2525
import android.graphics.PointF;
2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828

2929
import org.catrobat.catroid.ProjectManager;
3030
import org.catrobat.catroid.content.ActionFactory;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StopAllSoundsActionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import android.media.MediaPlayer;
2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828

2929
import com.badlogic.gdx.scenes.scene2d.Action;
3030

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/LookControllerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package org.catrobat.catroid.test.content.controller;
2525

2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828

2929
import org.catrobat.catroid.ProjectManager;
3030
import org.catrobat.catroid.common.LookData;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SceneControllerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package org.catrobat.catroid.test.content.controller;
2525

2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828

2929
import org.catrobat.catroid.ProjectManager;
3030
import org.catrobat.catroid.common.Constants;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SoundControllerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package org.catrobat.catroid.test.content.controller;
2525

2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828

2929
import org.catrobat.catroid.ProjectManager;
3030
import org.catrobat.catroid.common.SoundInfo;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/controller/SpriteControllerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package org.catrobat.catroid.test.content.controller;
2525

2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828

2929
import org.catrobat.catroid.ProjectManager;
3030
import org.catrobat.catroid.common.LookData;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/messagecontainer/MessageContainerSaveStateTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
package org.catrobat.catroid.test.content.messagecontainer;
2424

2525
import android.support.test.InstrumentationRegistry;
26-
import android.support.test.runner.AndroidJUnit4;
26+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2727

2828
import org.catrobat.catroid.ProjectManager;
2929
import org.catrobat.catroid.common.FlavoredConstants;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/messagecontainer/MessageContainerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
package org.catrobat.catroid.test.content.messagecontainer;
2424

2525
import android.support.test.InstrumentationRegistry;
26-
import android.support.test.runner.AndroidJUnit4;
26+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2727

2828
import org.catrobat.catroid.ProjectManager;
2929
import org.catrobat.catroid.common.FlavoredConstants;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/script/WhenScriptTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package org.catrobat.catroid.test.content.script;
2525

2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828

2929
import com.badlogic.gdx.graphics.Color;
3030

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/script/WhenTouchDownScriptTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
package org.catrobat.catroid.test.content.script;
2525

2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828

2929
import org.catrobat.catroid.ProjectManager;
3030
import org.catrobat.catroid.content.Project;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/sprite/LookTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
package org.catrobat.catroid.test.content.sprite;
2424

25-
import android.support.test.runner.AndroidJUnit4;
25+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2626

2727
import com.badlogic.gdx.graphics.Color;
2828
import com.badlogic.gdx.graphics.Pixmap;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/sprite/SpriteTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
package org.catrobat.catroid.test.content.sprite;
2424

2525
import android.support.test.InstrumentationRegistry;
26-
import android.support.test.runner.AndroidJUnit4;
26+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2727

2828
import org.catrobat.catroid.ProjectManager;
2929
import org.catrobat.catroid.content.ActionFactory;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/devices/arduino/ArduinoImplTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
package org.catrobat.catroid.test.devices.arduino;
2525

26-
import android.support.test.runner.AndroidJUnit4;
26+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2727

2828
import org.catrobat.catroid.common.bluetooth.ConnectionDataLogger;
2929
import org.catrobat.catroid.common.firmata.FirmataMessage;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/devices/arduino/ArduinoSettingsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import android.content.Context;
2727
import android.support.test.InstrumentationRegistry;
28-
import android.support.test.runner.AndroidJUnit4;
28+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2929

3030
import org.catrobat.catroid.ProjectManager;
3131
import org.catrobat.catroid.common.FlavoredConstants;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/devices/mindstorms/ev3/LegoEV3ImplTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import android.content.Context;
2626
import android.support.test.InstrumentationRegistry;
27-
import android.support.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828

2929
import org.catrobat.catroid.common.bluetooth.ConnectionDataLogger;
3030
import org.catrobat.catroid.devices.mindstorms.MindstormsException;

‎catroid/src/androidTest/java/org/catrobat/catroid/test/devices/mindstorms/ev3/LegoEV3MotorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import android.content.Context;
2727
import android.support.test.InstrumentationRegistry;
28-
import android.support.test.runner.AndroidJUnit4;
28+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2929

3030
import org.catrobat.catroid.common.bluetooth.ConnectionDataLogger;
3131
import org.catrobat.catroid.devices.mindstorms.MindstormsException;

0 commit comments

Comments
 (0)