Merge pull request Catrobat#3702 from ndrnour/Catroid-636

CATROID-636: Migrate to AndroidX (targetSdkVersion 29)

Author: wslany

catroid/build.gradle

@@ -132,12 +132,12 @@ jacocoAndroidUnitTestReport {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
 
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         applicationId appId
         testInstrumentationRunner 'org.catrobat.catroid.runner.UiTestApplicationRunner'
         versionCode 79

catroid/proguard-project.txt

@@ -19,11 +19,6 @@
 #   public *;
 #}
 
-
-# The official support library.
--keep class android.support.v4.app.** { *; }
--keep interface android.support.v4.app.** { *; }
-
 # Library JARs
 -keep class com.thoughtworks.xstream.** { *; }
 -keep interface com.thoughtworks.xstream.** { *; }

catroid/src/main/java/org/catrobat/catroid/CatroidApplication.java

@@ -65,7 +65,7 @@ public class CatroidApplication extends Application implements HasActivityInject
 	DispatchingAndroidInjector<Activity> dispatchingActivityInjector;
 	protected AppComponent appComponents;
 
-	@TargetApi(28)
+	@TargetApi(29)
 	@Override
 	public void onCreate() {
 		super.onCreate();

catroid/src/test/java/org/catrobat/catroid/test/robolectric/bricks/BrickAddCategoryTest.java

@@ -25,6 +25,7 @@
 
 import android.app.Activity;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.preference.PreferenceManager;
 import android.widget.ListAdapter;
 
@@ -44,6 +45,7 @@
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -65,6 +67,7 @@
 import static org.catrobat.catroid.ui.settingsfragments.SettingsFragment.SETTINGS_SHOW_RASPI_BRICKS;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(sdk = {Build.VERSION_CODES.P})
 public class BrickAddCategoryTest {
 
 	private SpriteActivity activity;

catroid/src/test/java/org/catrobat/catroid/test/robolectric/bricks/BrickSingleFormulaFieldTest.java

@@ -24,6 +24,7 @@
 package org.catrobat.catroid.test.robolectric.bricks;
 
 import android.app.Activity;
+import android.os.Build;
 import android.view.View;
 import android.widget.TextView;
 
@@ -143,7 +144,7 @@
 import static org.junit.Assert.assertThat;
 
 @RunWith(ParameterizedRobolectricTestRunner.class)
-@Config(sdk = {25})
+@Config(sdk = {Build.VERSION_CODES.P})
 public class BrickSingleFormulaFieldTest {
 
 	private SpriteActivity activity;

catroid/src/test/java/org/catrobat/catroid/test/robolectric/bricks/BrickSpinnerDefaultValueTest.java

@@ -25,6 +25,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.os.Build;
 import android.view.View;
 import android.widget.Spinner;
 
@@ -67,6 +68,7 @@
 import org.robolectric.ParameterizedRobolectricTestRunner;
 import org.robolectric.Robolectric;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -76,6 +78,7 @@
 import static junit.framework.TestCase.assertNotNull;
 
 @RunWith(ParameterizedRobolectricTestRunner.class)
+@Config(sdk = {Build.VERSION_CODES.P})
 public class BrickSpinnerDefaultValueTest {
 
 	private CategoryBricksFactory categoryBricksFactory;

catroid/src/test/java/org/catrobat/catroid/test/robolectric/bricks/BrickSpinnerTest.java

@@ -24,6 +24,7 @@
 package org.catrobat.catroid.test.robolectric.bricks;
 
 import android.app.Activity;
+import android.os.Build;
 import android.view.View;
 import android.widget.Spinner;
 
@@ -81,6 +82,7 @@
 import org.robolectric.ParameterizedRobolectricTestRunner;
 import org.robolectric.Robolectric;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -99,6 +101,7 @@
 import static org.junit.Assert.assertThat;
 
 @RunWith(ParameterizedRobolectricTestRunner.class)
+@Config(sdk = {Build.VERSION_CODES.P})
 public class BrickSpinnerTest {
 
 	private SpriteActivity activity;

catroid/src/test/java/org/catrobat/catroid/test/robolectric/bricks/BrickStringSpinnerDefaultValueTest.java

@@ -25,6 +25,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.os.Build;
 import android.view.View;
 import android.widget.Spinner;
 
@@ -60,6 +61,7 @@
 import org.robolectric.ParameterizedRobolectricTestRunner;
 import org.robolectric.Robolectric;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -69,6 +71,7 @@
 import static junit.framework.TestCase.assertNotNull;
 
 @RunWith(ParameterizedRobolectricTestRunner.class)
+@Config(sdk = {Build.VERSION_CODES.P})
 public class BrickStringSpinnerDefaultValueTest {
 
 	private CategoryBricksFactory categoryBricksFactory;

catroid/src/test/java/org/catrobat/catroid/test/robolectric/bricks/BrickStringSpinnerTest.java

@@ -24,6 +24,7 @@
 package org.catrobat.catroid.test.robolectric.bricks;
 
 import android.app.Activity;
+import android.os.Build;
 import android.view.View;
 import android.widget.Spinner;
 
@@ -63,6 +64,7 @@
 import org.robolectric.ParameterizedRobolectricTestRunner;
 import org.robolectric.Robolectric;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -80,6 +82,7 @@
 import static org.junit.Assert.assertThat;
 
 @RunWith(ParameterizedRobolectricTestRunner.class)
+@Config(sdk = {Build.VERSION_CODES.P})
 public class BrickStringSpinnerTest {
 
 	private SpriteActivity activity;

catroid/src/test/java/org/catrobat/catroid/test/robolectric/bricks/BroadcastBrickTest.java

@@ -25,6 +25,7 @@
 
 import android.app.Activity;
 import android.content.DialogInterface;
+import android.os.Build;
 import android.view.View;
 import android.widget.Spinner;
 
@@ -46,6 +47,7 @@
 import org.robolectric.ParameterizedRobolectricTestRunner;
 import org.robolectric.Robolectric;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -56,6 +58,7 @@
 import static junit.framework.Assert.assertNotNull;
 
 @RunWith(ParameterizedRobolectricTestRunner.class)
+@Config(sdk = {Build.VERSION_CODES.P})
 public class BroadcastBrickTest {
 
 	private static final String INITAL_MESSAGE = "initialMessage";

catroid/src/test/java/org/catrobat/catroid/test/robolectric/formulaeditor/FormulaEditorEditTextGenericTest.java

@@ -24,6 +24,7 @@
 package org.catrobat.catroid.test.robolectric.formulaeditor;
 
 import android.app.Activity;
+import android.os.Build;
 import android.os.SystemClock;
 import android.view.MotionEvent;
 import android.view.View;
@@ -46,6 +47,7 @@
 import org.robolectric.ParameterizedRobolectricTestRunner;
 import org.robolectric.Robolectric;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
 
 import java.util.Arrays;
 
@@ -54,6 +56,7 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(ParameterizedRobolectricTestRunner.class)
+@Config(sdk = {Build.VERSION_CODES.P})
 public class FormulaEditorEditTextGenericTest {
 
 	@ParameterizedRobolectricTestRunner.Parameters(name = "{0}" + "-Test")