Androidx

build.gradle

@@ -2,17 +2,14 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
         mavenLocal()
         mavenCentral()
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
-        // to auto install sdk components when building see #248
-        // classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
-        classpath 'com.github.plastiv:sdk-manager-plugin:b04aea1cddf87e78db9a4372794d678f9e568c48'
-
+        classpath 'com.android.tools.build:gradle:3.5.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -27,10 +24,6 @@ allprojects {
         jcenter()
         mavenLocal()
         mavenCentral()
+        google()
     }
-    apply plugin: 'android-sdk-manager' //see #248
-}
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '3.2'
-}
+}

gradle.properties

@@ -1,30 +1,24 @@
 # Project-wide Gradle settings.
-
 # IDE (e.g. Android Studio) users:
 # Settings specified in this file will override any Gradle settings
 # configured through the IDE.
-
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
 # 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
-VERSION_NAME=3.1.0
-VERSION_CODE=310
+VERSION_NAME=3.1.1
+VERSION_CODE=311
 GROUP=com.code-troopers.betterpickers
-
-ANDROID_BUILD_MIN_SDK_VERSION=9
-ANDROID_BUILD_TARGET_SDK_VERSION=25
-ANDROID_BUILD_SDK_VERSION=25
-ANDROID_BUILD_TOOLS_VERSION=25.0.0
-
+ANDROID_BUILD_MIN_SDK_VERSION=14
+ANDROID_BUILD_TARGET_SDK_VERSION=29
+ANDROID_BUILD_SDK_VERSION=29
+ANDROID_BUILD_TOOLS_VERSION=29.0.2
 POM_DESCRIPTION=Android library for better number/date/time-picker DialogFragments.
 POM_URL=http://github.com/derekbrameyer/android-betterpickers
 POM_SCM_URL=http://github.com/derekbrameyer/android-betterpickers
@@ -35,4 +29,6 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=codetroopers
 POM_DEVELOPER_NAME=Code Troopers
-POM_DEVELOPER_EMAIL=contact@code-troopers.com
+POM_DEVELOPER_EMAIL=contact@code-troopers.com
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

library/build.gradle

@@ -35,7 +35,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.nineoldandroids:library:2.4.0'
-    compile 'com.android.support:appcompat-v7:25.0.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.nineoldandroids:library:2.4.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 }

library/src/main/java/com/codetroopers/betterpickers/TouchExplorationHelper.java

@@ -19,11 +19,11 @@
 import android.content.Context;
 import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.v4.view.AccessibilityDelegateCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeProviderCompat;
-import android.support.v4.view.accessibility.AccessibilityRecordCompat;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
+import androidx.core.view.accessibility.AccessibilityRecordCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;

library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/CalendarDatePickerDialogFragment.java

@@ -21,10 +21,10 @@
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.core.content.ContextCompat;
 import android.text.format.DateUtils;
 import android.util.Log;
 import android.util.SparseArray;

library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/MonthAdapter.java

@@ -21,7 +21,7 @@
 import android.content.res.TypedArray;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.format.Time;
 import android.view.View;
 import android.view.ViewGroup;

library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/MonthView.java

@@ -27,11 +27,11 @@
 import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v4.widget.ExploreByTouchHelper;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.customview.widget.ExploreByTouchHelper;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.text.format.Time;

library/src/main/java/com/codetroopers/betterpickers/calendardatepicker/YearPickerView.java

@@ -20,8 +20,8 @@
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.drawable.StateListDrawable;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;

library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePicker.java

@@ -6,8 +6,8 @@
 import android.content.res.TypedArray;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.text.format.DateFormat;
 import android.util.AttributeSet;
 import android.view.HapticFeedbackConstants;

library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePickerBuilder.java

@@ -1,8 +1,8 @@
 package com.codetroopers.betterpickers.datepicker;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import android.util.Log;
 
 import com.codetroopers.betterpickers.OnDialogDismissListener;

library/src/main/java/com/codetroopers/betterpickers/datepicker/DatePickerDialogFragment.java

@@ -5,8 +5,8 @@
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPicker.java

@@ -7,8 +7,8 @@
 import android.content.res.TypedArray;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.text.format.DateFormat;
 import android.util.AttributeSet;
 import android.view.HapticFeedbackConstants;

library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPickerBuilder.java

@@ -1,8 +1,8 @@
 package com.codetroopers.betterpickers.expirationpicker;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import android.util.Log;
 
 import com.codetroopers.betterpickers.OnDialogDismissListener;

library/src/main/java/com/codetroopers/betterpickers/expirationpicker/ExpirationPickerDialogFragment.java

@@ -5,8 +5,8 @@
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

library/src/main/java/com/codetroopers/betterpickers/hmspicker/HmsPickerBuilder.java

@@ -1,8 +1,8 @@
 package com.codetroopers.betterpickers.hmspicker;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import android.util.Log;
 
 import com.codetroopers.betterpickers.OnDialogDismissListener;

library/src/main/java/com/codetroopers/betterpickers/hmspicker/HmsPickerDialogFragment.java

@@ -5,8 +5,8 @@
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

library/src/main/java/com/codetroopers/betterpickers/numberpicker/NumberPickerBuilder.java

@@ -1,8 +1,8 @@
 package com.codetroopers.betterpickers.numberpicker;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import android.util.Log;
 
 import com.codetroopers.betterpickers.OnDialogDismissListener;

library/src/main/java/com/codetroopers/betterpickers/numberpicker/NumberPickerDialogFragment.java

@@ -5,8 +5,8 @@
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/AmPmCirclesView.java

@@ -23,7 +23,7 @@
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.Typeface;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.View;
 

library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/CircleView.java

@@ -21,7 +21,7 @@
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.View;
 

library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialPickerLayout.java

@@ -22,7 +22,7 @@
 import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.view.accessibility.AccessibilityManagerCompat;
+import androidx.core.view.accessibility.AccessibilityManagerCompat;
 import android.text.format.DateUtils;
 import android.text.format.Time;
 import android.util.AttributeSet;

library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialSelectorView.java

@@ -21,7 +21,7 @@
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.View;
 

library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialTextsView.java

@@ -23,7 +23,7 @@
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.Typeface;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.View;
 

library/src/main/java/com/codetroopers/betterpickers/radialtimepicker/RadialTimePickerDialogFragment.java

@@ -22,8 +22,8 @@
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.content.ContextCompat;
+import androidx.fragment.app.DialogFragment;
+import androidx.core.content.ContextCompat;
 import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.KeyCharacterMap;

library/src/main/java/com/codetroopers/betterpickers/recurrencepicker/RecurrencePickerDialogFragment.java

@@ -25,9 +25,9 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.widget.SwitchCompat;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.widget.SwitchCompat;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;

library/src/main/java/com/codetroopers/betterpickers/recurrencepicker/WeekButton.java

@@ -17,7 +17,7 @@
 package com.codetroopers.betterpickers.recurrencepicker;
 
 import android.content.Context;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 

library/src/main/java/com/codetroopers/betterpickers/timepicker/TimePickerBuilder.java

@@ -1,8 +1,8 @@
 package com.codetroopers.betterpickers.timepicker;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import android.util.Log;
 
 import com.codetroopers.betterpickers.OnDialogDismissListener;

library/src/main/java/com/codetroopers/betterpickers/timepicker/TimePickerDialogFragment.java

@@ -5,8 +5,8 @@
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

library/src/main/java/com/codetroopers/betterpickers/timezonepicker/TimeZoneInfo.java

@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Spannable;
 import android.text.Spannable.Factory;
 import android.text.format.DateUtils;