Android-Support to AndroidX Upgrade (#1856)

* Updated from android-support to androidx * lowering versions * Fixed version issue * Fixed unit test * Fixed other android.support library * Fixed other android.support library (undo comment out of jvmargs)
osmdroid · Nov 25, 2022 · 713f680 · 713f680
1 parent abbd819
commit 713f680
Show file tree

Hide file tree

Showing 74 changed files with 181 additions and 136 deletions.
diff --git a/OpenStreetMapViewer/build.gradle b/OpenStreetMapViewer/build.gradle
@@ -1,12 +1,11 @@
-
 description = 'OpenMap in the Play Store, the example app for using osmdroid'
 
 apply plugin: 'com.android.application'
 apply from: "$rootDir/gradle/android-signing.gradle"
 
 
 group = project.property("pom.groupId")
-version =  project.property("pom.version")
+version = project.property("pom.version")
 
 android {
     compileSdkVersion findProperty('android.compileSdkVersion').toInteger()
@@ -16,7 +15,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
 
-
         applicationId "org.osmdroid"
 
         minSdkVersion 21
@@ -44,20 +42,19 @@ android {
             // All the usual Gradle options.
             testLogging {
                 events "passed", "skipped", "failed", "standardOut", "standardError"
-                outputs.upToDateWhen {false}
+                outputs.upToDateWhen { false }
                 showStandardStreams = true
             }
         }
     }
-    
-    packagingOptions{
+
+    packagingOptions {
         pickFirst "androidsupportmultidexversion.txt"
         pickFirst "META-INF/AL2.0"
         pickFirst "META-INF/LGPL2.1"
     }
 
 
-
 }
 
 
@@ -67,12 +64,12 @@ dependencies {
     //are not longer resolved...
 
     //osmdroid-mapsforge
-    implementation 'org.mapsforge:mapsforge-map-android:0.11.0'
-    implementation 'org.mapsforge:mapsforge-map:0.11.0'
+    implementation 'org.mapsforge:mapsforge-map-android:0.18.0'
+    implementation 'org.mapsforge:mapsforge-map:0.18.0'
     implementation 'org.mapsforge:mapsforge-themes:0.11.0'
 
 
-    implementation "com.android.support:support-v4:${project.property('android-support.version')}"
+    implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation project(':osmdroid-android')
     implementation project(':osmdroid-geopackage')
     implementation project(':osmdroid-mapsforge')
@@ -88,21 +85,21 @@ dependencies {
     implementation group: 'com.opencsv', name: 'opencsv', version: '4.4'
 
     //usual android stuff
-    implementation "com.android.support:design:${project.property('android-support.version')}" //needed for UI menuing
-    implementation "com.android.support:cardview-v7:${project.property('android-support.version')}"  //needed for samples only
-    implementation "com.android.support:recyclerview-v7:${project.property('android-support.version')}" //needed for samples only
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation "com.google.android.material:material:1.6.1" //needed for UI menuing
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation 'androidx.multidex:multidex:2.0.1'
 
-    implementation "com.android.support:appcompat-v7:${project.property('android-support.version')}" //needed for UI menuing
+    implementation "androidx.appcompat:appcompat:1.4.2"
     //crash logging
     implementation 'ch.acra:acra:4.7.0'
 
     //memory leak testing
     implementation 'com.squareup.leakcanary:leakcanary-android:2.2'
 
     //on device testing
-    androidTestImplementation  'com.android.support:multidex:1.0.3'
-    androidTestImplementation  "com.android.support:support-annotations:${project.property('android-support.version')}"
+    androidTestImplementation 'androidx.multidex:multidex:2.0.0'
+    androidTestImplementation "androidx.annotation:annotation:1.3.0"
 
 
     androidTestImplementation "androidx.test:runner:1.4.0"
@@ -112,15 +109,15 @@ dependencies {
     // Optional -- UI testing with UI Automator
     androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
     // Optional -- UI testing with Compose
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.1.1"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.1.0"
 }
 
 
 //the following sets the required permissions for API 23+ devices and AVDs
 
 android.applicationVariants.all { variant ->
     if (variant.getBuildType().name == "debug") {
-        task "configDevice${variant.name.capitalize()}" (type: Exec){
+        task "configDevice${variant.name.capitalize()}"(type: Exec) {
             dependsOn variant.install
 
             group = 'nameofyourtaskgroup'
@@ -137,7 +134,7 @@ android.applicationVariants.all { variant ->
 
 android.applicationVariants.all { variant ->
     if (variant.getBuildType().name == "debug") {
-        task "configDevice2${variant.name.capitalize()}" (type: Exec){
+        task "configDevice2${variant.name.capitalize()}"(type: Exec) {
             dependsOn variant.install
 
             group = 'nameofyourtaskgroup'

diff --git a/OpenStreetMapViewer/src/androidTest/java/org/osmdroid/test/ExtraSamplesTest.java b/OpenStreetMapViewer/src/androidTest/java/org/osmdroid/test/ExtraSamplesTest.java
@@ -9,8 +9,6 @@
 
 package org.osmdroid.test;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
 import android.util.Log;
 
 import junit.framework.Assert;
@@ -29,6 +27,8 @@
 
 import java.util.Random;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import androidx.test.rule.ActivityTestRule;
 
 import static org.junit.Assert.assertNotNull;

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/Bug1783Activity.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/Bug1783Activity.java
@@ -1,14 +1,15 @@
 package org.osmdroid;
 
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
 import android.view.View;
 import android.widget.Button;
 
 import org.osmdroid.bugtestfragments.Bug1783MyLocationOverlayNPE;
 import org.osmdroid.model.IBaseActivity;
 
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
+
 public class Bug1783Activity extends FragmentActivity implements IBaseActivity {
 
     @Override

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/BugsTestingActivity.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/BugsTestingActivity.java
@@ -1,10 +1,6 @@
 package org.osmdroid;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.KeyEvent;
 
 import org.osmdroid.bugtestfragments.BugFactory;
@@ -17,6 +13,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
 /**
  * Created by alex on 6/29/16.
  */

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/ExtraSamplesActivity.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/ExtraSamplesActivity.java
@@ -1,10 +1,6 @@
 package org.osmdroid;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.KeyEvent;
 
 import org.osmdroid.samplefragments.BaseSampleFragment;
@@ -14,6 +10,11 @@
 
 import java.util.Collections;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
 public class ExtraSamplesActivity extends AppCompatActivity {
     public static final String SAMPLES_FRAGMENT_TAG = "org.osmdroid.SAMPLES_FRAGMENT_TAG";
 

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/LicenseActivity.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/LicenseActivity.java
@@ -1,14 +1,15 @@
 package org.osmdroid;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 /**
  * created on 1/14/2017.
  *

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/MainActivity.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/MainActivity.java
@@ -11,9 +11,6 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.text.format.Formatter;
 import android.view.View;
 import android.widget.AdapterView;
@@ -33,6 +30,10 @@
 import java.io.File;
 import java.util.ArrayList;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 public class MainActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
 
     public static final String TAG = "OSM";

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/OsmApplication.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/OsmApplication.java
@@ -3,8 +3,6 @@
 import android.content.Context;
 import android.os.Environment;
 import android.os.StrictMode;
-import android.support.multidex.MultiDex;
-import android.support.multidex.MultiDexApplication;
 import android.util.Log;
 
 import org.acra.ACRA;
@@ -19,6 +17,9 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
+import androidx.multidex.MultiDex;
+import androidx.multidex.MultiDexApplication;
+
 /**
  * This is the base application for the sample app. We only use to catch errors during development cycles
  * <p>

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/PreferenceActivity.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/PreferenceActivity.java
@@ -6,8 +6,6 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
@@ -30,6 +28,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 /**
  * OK so why is here?
  * Stupid reason #1: Android Studio's wizard generates a bunch of stupid complex code

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/StarterMapActivity.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/StarterMapActivity.java
@@ -7,11 +7,12 @@
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.KeyEvent;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.FragmentManager;
+
 /**
  * Default map view activity.
  *

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/StarterMapFragment.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/StarterMapFragment.java
@@ -6,7 +6,6 @@
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.util.DisplayMetrics;
 import android.view.InputDevice;
 import android.view.LayoutInflater;
@@ -31,6 +30,8 @@
 import org.osmdroid.views.overlay.mylocation.GpsMyLocationProvider;
 import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay;
 
+import androidx.fragment.app.Fragment;
+
 /**
  * Default map view activity.
  *

diff --git a/...eetMapViewer/src/main/java/org/osmdroid/bugtestfragments/Bug1783MyLocationOverlayNPE.java b/...eetMapViewer/src/main/java/org/osmdroid/bugtestfragments/Bug1783MyLocationOverlayNPE.java
@@ -1,13 +1,13 @@
 package org.osmdroid.bugtestfragments;
 
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.osmdroid.views.MapView;
 import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay;
+import androidx.fragment.app.DialogFragment;
 
 
 /**

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/bugtestfragments/SampleBug57.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/bugtestfragments/SampleBug57.java
@@ -1,7 +1,6 @@
 package org.osmdroid.bugtestfragments;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,6 +12,8 @@
 import org.osmdroid.samplefragments.BaseSampleFragment;
 import org.osmdroid.views.MapView;
 
+import androidx.fragment.app.FragmentManager;
+
 
 /**
  * https://github.com/osmdroid/osmdroid/issues/57

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/bugtestfragments/SampleBug57Step2.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/bugtestfragments/SampleBug57Step2.java
@@ -2,13 +2,14 @@
 
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.osmdroid.R;
 
+import androidx.fragment.app.Fragment;
+
 /**
  * A simple {@link Fragment} subclass.
  */

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/bugtestfragments/WeathForceActivity.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/bugtestfragments/WeathForceActivity.java
@@ -10,7 +10,6 @@
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
 import android.util.Log;
 import android.view.Surface;
 import android.view.WindowManager;
@@ -30,6 +29,8 @@
 import org.osmdroid.views.overlay.compass.InternalCompassOrientationProvider;
 import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay;
 
+import androidx.core.app.ActivityCompat;
+
 /**
  * http://stackoverflow.com/q/40112165/1203182
  * Created by alex on 10/21/16.

diff --git a/OpenStreetMapViewer/src/main/java/org/osmdroid/data/DataCountryLoader.java b/OpenStreetMapViewer/src/main/java/org/osmdroid/data/DataCountryLoader.java
@@ -1,11 +1,12 @@
 package org.osmdroid.data;
 
 import android.content.Context;
-import android.support.annotation.RawRes;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import androidx.annotation.RawRes;
+
 /**
  * {@link DataCountry} json loader
  *