From c497d53801e0964d91025625b6f8b2fb59515afc Mon Sep 17 00:00:00 2001 From: nmullaney Date: Fri, 7 May 2021 10:26:37 -0700 Subject: [PATCH 1/2] Update to newest versions of gradle --- build.gradle | 3 ++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- rangeseekbar/build.gradle | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index dfe5c8f..13c15e3 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,10 @@ buildscript { repositories { jcenter() mavenCentral() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:4.1.2' classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 83e1d30..1840849 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu May 26 16:38:46 BST 2016 +#Fri May 07 10:25:36 PDT 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/rangeseekbar/build.gradle b/rangeseekbar/build.gradle index 67fd780..a81bf0e 100644 --- a/rangeseekbar/build.gradle +++ b/rangeseekbar/build.gradle @@ -1,10 +1,11 @@ buildscript { repositories { mavenCentral() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:4.1.2' } } From 40110a77457f59f59576f603eee7501d41130372 Mon Sep 17 00:00:00 2001 From: nmullaney Date: Fri, 7 May 2021 10:33:57 -0700 Subject: [PATCH 2/2] Migrated to AndroidX --- README.md | 2 ++ build.gradle | 1 + gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- rangeseekbar-sample/build.gradle | 11 +++++------ rangeseekbar/build.gradle | 19 +++++++++---------- .../android/rangeseekbar/RangeSeekBar.java | 9 +++++---- 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 5f94f58..e4596fe 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ range-seek-bar # Introduction +Refactored to support AndroidX. + If you are coming from [the original repo](https://github.com/yahoo/android-range-seek-bar), it has a [new home](https://github.com/anothem/android-range-seek-bar) so if you're seeing this, you're probably in the right place. This library provides a SeekBar similar to the default Android one, but with two thumb controls allowing a range to be selected. diff --git a/build.gradle b/build.gradle index 13c15e3..f6d4090 100644 --- a/build.gradle +++ b/build.gradle @@ -18,5 +18,6 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle.properties b/gradle.properties index c04991e..034d7ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,4 +34,6 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=anothem POM_DEVELOPER_NAME=Alex Florescu +android.useAndroidX=true +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1840849..c31bd48 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri May 07 10:25:36 PDT 2021 +#Fri May 07 10:27:33 PDT 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/rangeseekbar-sample/build.gradle b/rangeseekbar-sample/build.gradle index 4fd63f7..ba50599 100644 --- a/rangeseekbar-sample/build.gradle +++ b/rangeseekbar-sample/build.gradle @@ -6,13 +6,12 @@ repositories { } android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 29 defaultConfig { applicationId "org.florescu.android.rangeseekbar.sample" minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -25,7 +24,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.4.0' - compile project(':rangeseekbar') + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation project(':rangeseekbar') } diff --git a/rangeseekbar/build.gradle b/rangeseekbar/build.gradle index a81bf0e..015c738 100644 --- a/rangeseekbar/build.gradle +++ b/rangeseekbar/build.gradle @@ -5,22 +5,21 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:4.1.3' } } apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 29 defaultConfig { minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 29 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -36,13 +35,13 @@ dependencies { mavenCentral() } - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.android.support:support-annotations:23.4.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.annotation:annotation:1.2.0' // Robolectric - testCompile 'org.robolectric:robolectric:3.1-rc1' - testCompile "org.mockito:mockito-core:2.0.53-beta" + testImplementation 'org.robolectric:robolectric:3.1-rc1' + testImplementation "org.mockito:mockito-core:2.0.53-beta" } apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' \ No newline at end of file diff --git a/rangeseekbar/src/main/java/org/florescu/android/rangeseekbar/RangeSeekBar.java b/rangeseekbar/src/main/java/org/florescu/android/rangeseekbar/RangeSeekBar.java index 9e68614..188d470 100644 --- a/rangeseekbar/src/main/java/org/florescu/android/rangeseekbar/RangeSeekBar.java +++ b/rangeseekbar/src/main/java/org/florescu/android/rangeseekbar/RangeSeekBar.java @@ -32,13 +32,14 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.ColorRes; -import android.support.annotation.NonNull; import android.util.AttributeSet; import android.util.TypedValue; import android.view.MotionEvent; import android.view.ViewConfiguration; -import android.widget.ImageView; + +import androidx.annotation.ColorRes; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.AppCompatImageView; import org.florescu.android.util.BitmapUtil; import org.florescu.android.util.PixelUtil; @@ -58,7 +59,7 @@ * @author Alex Florescu (alex@florescu.org) * @author Michael Keppler (bananeweizen@gmx.de) */ -public class RangeSeekBar extends ImageView { +public class RangeSeekBar extends AppCompatImageView { /** * Default color of a {@link RangeSeekBar}, #FF33B5E5. This is also known as "Ice Cream Sandwich" blue. */