diff --git a/app/build.gradle b/app/build.gradle index ab2b96b..8b56c52 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,5 +21,5 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':multicontactpicker') - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/app/src/main/java/com/wafflecopter/multicontactpickerexample/MainActivity.java b/app/src/main/java/com/wafflecopter/multicontactpickerexample/MainActivity.java index 3a76ee5..5337be4 100644 --- a/app/src/main/java/com/wafflecopter/multicontactpickerexample/MainActivity.java +++ b/app/src/main/java/com/wafflecopter/multicontactpickerexample/MainActivity.java @@ -5,13 +5,13 @@ import android.content.pm.PackageManager; import android.graphics.Color; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; import com.wafflecopter.multicontactpicker.ContactResult; import com.wafflecopter.multicontactpicker.LimitColumn; import com.wafflecopter.multicontactpicker.MultiContactPicker; diff --git a/build.gradle b/build.gradle index b34d077..1fb303d 100644 --- a/build.gradle +++ b/build.gradle @@ -4,10 +4,11 @@ buildscript { repositories { jcenter() google() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' + classpath 'com.android.tools.build:gradle:7.1.2' +// classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -18,6 +19,7 @@ allprojects { repositories { jcenter() google() + mavenCentral() } } diff --git a/gradle.properties b/gradle.properties index aac7c9b..6dd0218 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,6 +10,7 @@ # Specifies the JVM arguments used for the daemon process. # 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c1cc6c9..7ba1f7d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Sep 30 17:56:50 BST 2018 +#Sun Sep 01 15:14:05 EEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/multicontactpicker/build.gradle b/multicontactpicker/build.gradle index f4cde82..736f3ef 100644 --- a/multicontactpicker/build.gradle +++ b/multicontactpicker/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' +//apply plugin: 'com.github.dcendents.android-maven' group='com.github.xbroak' android { compileSdkVersion 28 @@ -11,10 +11,7 @@ android { versionCode 1 versionName "1.0" } - configurations.all { - resolutionStrategy.force 'com.android.support:appcompat-v7:28.0.0' - resolutionStrategy.force 'com.android.support:design:28.0.0' - } + buildTypes { release { minifyEnabled false @@ -25,9 +22,9 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.l4digital.fastscroll:fastscroll:1.1.2' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'io.github.l4digital:fastscroll:2.0.1' implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' implementation 'io.reactivex.rxjava2:rxjava:2.1.6' - implementation 'com.miguelcatalan:materialsearchview:1.4.0' + implementation 'io.gitlab.alexto9090:materialsearchview:1.0.0' } diff --git a/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/MultiContactPicker.java b/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/MultiContactPicker.java index 8d40f82..205dbe1 100644 --- a/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/MultiContactPicker.java +++ b/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/MultiContactPicker.java @@ -2,11 +2,11 @@ import android.app.Activity; import android.content.Intent; -import android.support.annotation.AnimRes; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.StyleRes; -import android.support.v4.app.Fragment; +import androidx.annotation.AnimRes; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.fragment.app.Fragment; import com.wafflecopter.multicontactpicker.RxContacts.Contact; diff --git a/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/MultiContactPickerActivity.java b/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/MultiContactPickerActivity.java index 12f17df..4e20856 100644 --- a/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/MultiContactPickerActivity.java +++ b/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/MultiContactPickerActivity.java @@ -3,10 +3,6 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -14,6 +10,10 @@ import android.widget.ProgressBar; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.recyclerview.widget.LinearLayoutManager; import com.l4digital.fastscroll.FastScrollRecyclerView; import com.miguelcatalan.materialsearchview.MaterialSearchView; import com.wafflecopter.multicontactpicker.RxContacts.Contact; diff --git a/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/MultiContactPickerAdapter.java b/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/MultiContactPickerAdapter.java index 78189da..dc687ca 100644 --- a/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/MultiContactPickerAdapter.java +++ b/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/MultiContactPickerAdapter.java @@ -3,7 +3,6 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.Typeface; -import android.support.v7.widget.RecyclerView; import android.text.Spannable; import android.text.SpannableString; import android.text.style.TextAppearanceSpan; @@ -15,6 +14,7 @@ import android.widget.ImageView; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; import com.l4digital.fastscroll.FastScroller; import com.wafflecopter.multicontactpicker.RxContacts.Contact; import com.wafflecopter.multicontactpicker.Views.RoundLetterView; diff --git a/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/RxContacts/RxContacts.java b/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/RxContacts/RxContacts.java index f06450d..2848f24 100644 --- a/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/RxContacts/RxContacts.java +++ b/multicontactpicker/src/main/java/com/wafflecopter/multicontactpicker/RxContacts/RxContacts.java @@ -22,9 +22,9 @@ import android.net.Uri; import android.os.Build; import android.provider.ContactsContract; -import android.support.annotation.NonNull; import android.util.LongSparseArray; +import androidx.annotation.NonNull; import com.wafflecopter.multicontactpicker.LimitColumn; import io.reactivex.Observable; diff --git a/multicontactpicker/src/main/res/layout/activity_multi_contact_picker.xml b/multicontactpicker/src/main/res/layout/activity_multi_contact_picker.xml index 10b4d46..fb1d22d 100644 --- a/multicontactpicker/src/main/res/layout/activity_multi_contact_picker.xml +++ b/multicontactpicker/src/main/res/layout/activity_multi_contact_picker.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:visibility="visible"> -