Update gradle and libraries

lloydtorres · May 3, 2020 · bd335cc · bd335cc
1 parent 642960a
commit bd335cc
Show file tree

Hide file tree

Showing 10 changed files with 147 additions and 46 deletions.
diff --git a/Stately/.idea/codeStyles/Project.xml b/Stately/.idea/codeStyles/Project.xml
diff --git a/Stately/.idea/gradle.xml b/Stately/.idea/gradle.xml
diff --git a/Stately/.idea/misc.xml b/Stately/.idea/misc.xml
diff --git a/Stately/.idea/modules.xml b/Stately/.idea/modules.xml
diff --git a/Stately/app/build.gradle b/Stately/app/build.gradle
@@ -38,12 +38,12 @@ repositories {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation('org.simpleframework:simple-xml:2.7.+') {
+    implementation('org.simpleframework:simple-xml:2.7.1') {
         exclude module: 'stax'
         exclude module: 'stax-api'
         exclude module: 'xpp3'
     }
-    implementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') {
+    implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
         transitive = true
     }
     implementation 'com.android.support:appcompat-v7:28.0.0'
@@ -55,10 +55,10 @@ dependencies {
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.github.satyan:sugar:1.5'
     implementation 'com.github.omadahealth:swipy:1.2.3@aar'
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     implementation 'org.atteo:evo-inflector:1.2.2'
-    implementation 'org.jsoup:jsoup:1.11.3'
-    implementation 'org.sufficientlysecure:html-textview:3.6'
+    implementation 'org.jsoup:jsoup:1.13.1'
+    implementation 'org.sufficientlysecure:html-textview:3.9'
     implementation 'com.jpardogo.materialtabstrip:library:1.1.1'
     implementation 'com.r0adkll:slidableactivity:2.0.6'
     implementation 'pl.bclogic:pulsator4droid:1.0.3'

diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/helpers/LargeNumberAxisFormatter.java b/Stately/app/src/main/java/com/lloydtorres/stately/helpers/LargeNumberAxisFormatter.java
@@ -18,15 +18,14 @@
 
 import android.content.Context;
 
-import com.github.mikephil.charting.components.AxisBase;
-import com.github.mikephil.charting.formatter.IAxisValueFormatter;
+import com.github.mikephil.charting.formatter.ValueFormatter;
 
 /**
  * Created by Lloyd on 2016-10-31.
  * Axis formatter for charts that deals with large numbers.
  * Implemented because MPAndroidChart's own implementation breaks for REALLY large numbers.
  */
-public class LargeNumberAxisFormatter implements IAxisValueFormatter {
+public class LargeNumberAxisFormatter extends ValueFormatter {
 
     private Context context;
 
@@ -35,7 +34,7 @@ public LargeNumberAxisFormatter(Context c) {
     }
 
     @Override
-    public String getFormattedValue(float value, AxisBase axis) {
+    public String getFormattedValue(float value) {
         return SparkleHelper.getPrettifiedShortSuffixedNumber(context, value);
     }
 }
diff --git a/Stately/app/src/main/java/com/lloydtorres/stately/helpers/XAxisLabelFormatter.java b/Stately/app/src/main/java/com/lloydtorres/stately/helpers/XAxisLabelFormatter.java
@@ -16,16 +16,15 @@
 
 package com.lloydtorres.stately.helpers;
 
-import com.github.mikephil.charting.components.AxisBase;
-import com.github.mikephil.charting.formatter.IAxisValueFormatter;
+import com.github.mikephil.charting.formatter.ValueFormatter;
 
 import java.util.List;
 
 /**
  * Created by Lloyd on 2016-10-22.
  * Provides labels to show in a chart's XAxis.
  */
-public class XAxisLabelFormatter implements IAxisValueFormatter {
+public class XAxisLabelFormatter extends ValueFormatter {
 
     private List<String> labels;
 
@@ -34,7 +33,7 @@ public XAxisLabelFormatter(List<String> l) {
     }
 
     @Override
-    public String getFormattedValue(float value, AxisBase axis) {
+    public String getFormattedValue(float value) {
         if (labels == null || value >= labels.size()) {
             return "";
         } else {

diff --git a/Stately/build.gradle b/Stately/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.6.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/Stately/gradle.properties b/Stately/gradle.properties
@@ -15,4 +15,6 @@
 # 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
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+
+android.useAndroidX=true
diff --git a/Stately/gradle/wrapper/gradle-wrapper.properties b/Stately/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 17 22:02:38 PDT 2018
+#Sat May 02 18:58:54 PDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip