From 5808730e08dcb80c4d096507d07582734d4d013a Mon Sep 17 00:00:00 2001 From: Aftab Ahmad Date: Thu, 14 Jan 2021 11:56:06 +0000 Subject: [PATCH 1/2] Update versions --- build.gradle | 2 +- spark-sample/build.gradle | 6 +++--- spark/build.gradle | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 39cc01f..14ab849 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:3.4.3' classpath 'digital.wup:android-maven-publish:3.6.2' // NOTE: Do not place your application dependencies here; they belong diff --git a/spark-sample/build.gradle b/spark-sample/build.gradle index 7e8a679..c831cce 100644 --- a/spark-sample/build.gradle +++ b/spark-sample/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 30 defaultConfig { applicationId "com.robinhood.spark.sample" minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 30 versionCode 1 versionName "1.0" } @@ -19,7 +19,7 @@ android { } dependencies { - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' implementation 'com.android.support:appcompat-v7:26.1.0' implementation project(path: ':spark') } diff --git a/spark/build.gradle b/spark/build.gradle index 0ac90ce..4d32842 100644 --- a/spark/build.gradle +++ b/spark/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 26 + compileSdkVersion 30 defaultConfig { minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 30 } resourcePrefix 'spark_' @@ -14,8 +14,8 @@ android { dependencies { implementation 'com.android.support:support-annotations:26.1.0' - testImplementation 'junit:junit:4.12' - testImplementation 'org.mockito:mockito-core:2.18.0' + testImplementation 'junit:junit:4.13' + testImplementation 'org.mockito:mockito-core:2.28.2' } apply from: 'gradle-mvn-push.gradle' From 5c384b48b888b9fbb7b3ef8d84c33dcf0289dfac Mon Sep 17 00:00:00 2001 From: Aftab Ahmad Date: Thu, 14 Jan 2021 11:57:57 +0000 Subject: [PATCH 2/2] Migrate to AndroidX --- gradle.properties | 2 ++ spark-sample/build.gradle | 2 +- .../java/com/robinhood/spark/sample/MainActivity.java | 4 ++-- spark/build.gradle | 2 +- .../java/com/robinhood/spark/ScrubGestureDetector.java | 2 +- spark/src/main/java/com/robinhood/spark/SparkAdapter.java | 4 ++-- spark/src/main/java/com/robinhood/spark/SparkView.java | 8 ++++---- .../com/robinhood/spark/animation/LineSparkAnimator.java | 6 +++--- .../com/robinhood/spark/animation/MorphSparkAnimator.java | 6 +++--- .../java/com/robinhood/spark/animation/SparkAnimator.java | 2 +- spark/src/test/java/com/robinhood/spark/TestAdapter.java | 2 +- 11 files changed, 21 insertions(+), 19 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8795b09..1024bbf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,3 +11,5 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=danh32 POM_DEVELOPER_NAME=Dan Hill + +android.useAndroidX=true diff --git a/spark-sample/build.gradle b/spark-sample/build.gradle index c831cce..b2b4213 100644 --- a/spark-sample/build.gradle +++ b/spark-sample/build.gradle @@ -20,6 +20,6 @@ android { dependencies { testImplementation 'junit:junit:4.13' - implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' implementation project(path: ':spark') } diff --git a/spark-sample/src/main/java/com/robinhood/spark/sample/MainActivity.java b/spark-sample/src/main/java/com/robinhood/spark/sample/MainActivity.java index a73ef38..f9586d0 100644 --- a/spark-sample/src/main/java/com/robinhood/spark/sample/MainActivity.java +++ b/spark-sample/src/main/java/com/robinhood/spark/sample/MainActivity.java @@ -17,8 +17,8 @@ package com.robinhood.spark.sample; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.view.animation.AccelerateDecelerateInterpolator; import android.widget.AdapterView; diff --git a/spark/build.gradle b/spark/build.gradle index 4d32842..c1eaa21 100644 --- a/spark/build.gradle +++ b/spark/build.gradle @@ -12,7 +12,7 @@ android { } dependencies { - implementation 'com.android.support:support-annotations:26.1.0' + implementation 'androidx.annotation:annotation:1.1.0' testImplementation 'junit:junit:4.13' testImplementation 'org.mockito:mockito-core:2.28.2' diff --git a/spark/src/main/java/com/robinhood/spark/ScrubGestureDetector.java b/spark/src/main/java/com/robinhood/spark/ScrubGestureDetector.java index b74ce0b..62f0fd1 100644 --- a/spark/src/main/java/com/robinhood/spark/ScrubGestureDetector.java +++ b/spark/src/main/java/com/robinhood/spark/ScrubGestureDetector.java @@ -17,7 +17,7 @@ package com.robinhood.spark; import android.os.Handler; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.MotionEvent; import android.view.View; diff --git a/spark/src/main/java/com/robinhood/spark/SparkAdapter.java b/spark/src/main/java/com/robinhood/spark/SparkAdapter.java index e7b7f66..0426b21 100644 --- a/spark/src/main/java/com/robinhood/spark/SparkAdapter.java +++ b/spark/src/main/java/com/robinhood/spark/SparkAdapter.java @@ -19,8 +19,8 @@ import android.database.DataSetObservable; import android.database.DataSetObserver; import android.graphics.RectF; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; /** * A simple adapter class - evenly distributes your points along the x axis, does not draw a base diff --git a/spark/src/main/java/com/robinhood/spark/SparkView.java b/spark/src/main/java/com/robinhood/spark/SparkView.java index d2efa67..374c3eb 100644 --- a/spark/src/main/java/com/robinhood/spark/SparkView.java +++ b/spark/src/main/java/com/robinhood/spark/SparkView.java @@ -28,10 +28,10 @@ import android.graphics.RectF; import android.os.Build; import android.os.Handler; -import android.support.annotation.ColorInt; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.util.Log; import android.view.View; diff --git a/spark/src/main/java/com/robinhood/spark/animation/LineSparkAnimator.java b/spark/src/main/java/com/robinhood/spark/animation/LineSparkAnimator.java index bd70bf7..312b8a3 100644 --- a/spark/src/main/java/com/robinhood/spark/animation/LineSparkAnimator.java +++ b/spark/src/main/java/com/robinhood/spark/animation/LineSparkAnimator.java @@ -5,9 +5,9 @@ import android.animation.ValueAnimator; import android.graphics.Path; import android.graphics.PathMeasure; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.robinhood.spark.SparkView; diff --git a/spark/src/main/java/com/robinhood/spark/animation/MorphSparkAnimator.java b/spark/src/main/java/com/robinhood/spark/animation/MorphSparkAnimator.java index fa57edb..96694f9 100644 --- a/spark/src/main/java/com/robinhood/spark/animation/MorphSparkAnimator.java +++ b/spark/src/main/java/com/robinhood/spark/animation/MorphSparkAnimator.java @@ -5,9 +5,9 @@ import android.animation.TimeInterpolator; import android.animation.ValueAnimator; import android.graphics.Path; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.robinhood.spark.SparkView; diff --git a/spark/src/main/java/com/robinhood/spark/animation/SparkAnimator.java b/spark/src/main/java/com/robinhood/spark/animation/SparkAnimator.java index 650899c..720df57 100644 --- a/spark/src/main/java/com/robinhood/spark/animation/SparkAnimator.java +++ b/spark/src/main/java/com/robinhood/spark/animation/SparkAnimator.java @@ -1,7 +1,7 @@ package com.robinhood.spark.animation; import android.animation.Animator; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.robinhood.spark.SparkView; diff --git a/spark/src/test/java/com/robinhood/spark/TestAdapter.java b/spark/src/test/java/com/robinhood/spark/TestAdapter.java index 81bbb4b..74f815a 100644 --- a/spark/src/test/java/com/robinhood/spark/TestAdapter.java +++ b/spark/src/test/java/com/robinhood/spark/TestAdapter.java @@ -1,7 +1,7 @@ package com.robinhood.spark; import android.graphics.RectF; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer;