Update to AndroidX

Use AndroidX instead of the support libraries.

HeatMapExample/build.gradle

@@ -28,11 +28,8 @@ allprojects {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    testCompile 'junit:junit:4.12'
-    compile project(path: ':HeatMapLib')
+    implementation "androidx.annotation:annotation:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    testImplementation 'junit:junit:4.13'
+    implementation project(path: ':HeatMapLib')
 }

HeatMapExample/src/main/java/ca/hss/heatmap/MainActivity.java

@@ -1,7 +1,7 @@
 /*
  * MainActivity.java
  *
- * Copyright 2017 Heartland Software Solutions Inc.
+ * Copyright 2020 Heartland Software Solutions Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,16 +20,16 @@
 
 import android.graphics.Color;
 import android.os.AsyncTask;
-import android.support.annotation.AnyThread;
-import android.support.v4.util.ArrayMap;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.AnyThread;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 
 import java.util.Map;
 import java.util.Random;
 
+import androidx.collection.ArrayMap;
 import ca.hss.heatmaplib.HeatMap;
 import ca.hss.heatmaplib.HeatMapMarkerCallback;
 
@@ -106,14 +106,17 @@ private void drawNewMap() {
         }
     }
 
+    @SuppressWarnings("SameParameterValue")
     private float clamp(float value, float min, float max) {
         return value * (max - min) + min;
     }
 
+    @SuppressWarnings("SameParameterValue")
     private double clamp(double value, double min, double max) {
         return value * (max - min) + min;
     }
 
+    @SuppressWarnings("SameParameterValue")
     private static int doGradient(double value, double min, double max, int min_color, int max_color) {
         if (value >= max) {
             return max_color;

HeatMapLib/build.gradle

@@ -29,9 +29,7 @@ allprojects {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:26.1.0'
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-annotations:26.1.0'
+    implementation "androidx.annotation:annotation:1.1.0"
 }
 
 apply plugin: 'com.github.dcendents.android-maven'

HeatMapLib/src/main/java/ca/hss/heatmaplib/HeatMap.java

@@ -1,7 +1,7 @@
 /*
  * HeatMap.java
  *
- * Copyright 2017 Heartland Software Solutions Inc.
+ * Copyright 2020 Heartland Software Solutions Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@
 import android.graphics.RadialGradient;
 import android.graphics.Rect;
 import android.graphics.Shader;
-import android.support.annotation.AnyThread;
-import android.support.annotation.WorkerThread;
-import android.support.annotation.ColorInt;
+import androidx.annotation.AnyThread;
+import androidx.annotation.WorkerThread;
+import androidx.annotation.ColorInt;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;

HeatMapLib/src/main/java/ca/hss/heatmaplib/HeatMapMarkerCallback.java

@@ -1,7 +1,7 @@
 /*
  * HeatMapMarkerCallback.java
  *
- * Copyright 2017 Heartland Software Solutions Inc.
+ * Copyright 2020 Heartland Software Solutions Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 
 /**
  * A callback to allow markers to be drawn over the heatmap at each data point.

gradle.properties

@@ -11,6 +11,8 @@
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
 
+android.useAndroidX=true
+
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects