From b2f3e2ee2e56de1ebd3c7600ecb44d8ba56aa938 Mon Sep 17 00:00:00 2001 From: "YASHPAL.RAJ" Date: Wed, 12 Dec 2018 11:53:42 +0530 Subject: [PATCH 1/6] 12122018 --- build.gradle | 5 +++-- demo/build.gradle | 13 +++++++------ gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 24 +++++++++++++++--------- library/src/main/AndroidManifest.xml | 1 - 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 90a5aa5..32d8267 100644 --- a/build.gradle +++ b/build.gradle @@ -17,14 +17,15 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.2.1' } } allprojects { - ext.support_lib_version = '26.0.2' + ext.support_lib_version = '28.0.0' ext.event_lib_version = '3.0.0' ext.fastscroll_lib_version = '0.1.3' diff --git a/demo/build.gradle b/demo/build.gradle index a5dc5d8..cd58365 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -16,14 +16,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '26.0.1' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.onegravity.contactpicker.demo" - minSdkVersion 14 - targetSdkVersion 25 + minSdkVersion 15 + targetSdkVersion 28 versionCode 10 versionName "1.3.2" @@ -51,8 +51,9 @@ android { dependencies { // debug builds should take the local code - debugCompile project(':library') + debugImplementation project(':library') + implementation "com.android.support:appcompat-v7:28.0.0" // release builds should take the published artifact - releaseCompile "com.1gravity:android-contactpicker:1.3.2" + releaseImplementation "com.1gravity:android-contactpicker:1.3.2" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e8af572..e12eb8c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Aug 29 22:41:54 EDT 2016 +#Tue Dec 11 19:24:30 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/library/build.gradle b/library/build.gradle index 54e3174..ae9435a 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -17,12 +17,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 26 - buildToolsVersion '26.0.1' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { - minSdkVersion 14 - targetSdkVersion 25 + minSdkVersion 15 + targetSdkVersion 28 } buildTypes { @@ -34,13 +34,19 @@ android { } dependencies { - compile "com.android.support:appcompat-v7:$support_lib_version" - compile "com.android.support:recyclerview-v7:$support_lib_version" - compile "com.android.support:design:$support_lib_version" + implementation "com.android.support:appcompat-v7:$support_lib_version" - compile "org.greenrobot:eventbus:$event_lib_version" + implementation "com.android.support:animated-vector-drawable:$support_lib_version" + implementation "com.android.support:support-v4:$support_lib_version" - compile "xyz.danoz:recyclerviewfastscroller:$fastscroll_lib_version" + implementation "com.android.support:support-annotations:$support_lib_version" + + implementation "com.android.support:recyclerview-v7:$support_lib_version" + implementation "com.android.support:design:$support_lib_version" + + implementation "org.greenrobot:eventbus:$event_lib_version" + + implementation "xyz.danoz:recyclerviewfastscroller:$fastscroll_lib_version" } apply from: '../android-artifacts.gradle' diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 6d25bb3..056c1e1 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -19,6 +19,5 @@ - From ad008e32dd4087ade1fcfb4e8ef4ffd1bf6d1518 Mon Sep 17 00:00:00 2001 From: Kyle Tee Date: Mon, 5 Aug 2019 13:12:24 +0200 Subject: [PATCH 2/6] Remove call to deprecated setOnTabSelectedListener in favour of addOnTabSelectedListener. --- .../onegravity/contactpicker/core/ContactPickerActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/onegravity/contactpicker/core/ContactPickerActivity.java b/library/src/main/java/com/onegravity/contactpicker/core/ContactPickerActivity.java index 451e2cb..b0b7575 100644 --- a/library/src/main/java/com/onegravity/contactpicker/core/ContactPickerActivity.java +++ b/library/src/main/java/com/onegravity/contactpicker/core/ContactPickerActivity.java @@ -367,7 +367,7 @@ protected void onCreate(Bundle savedInstanceState) { viewPager.setAdapter(mAdapter); viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout)); - tabLayout.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { + tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { @Override public void onTabSelected(TabLayout.Tab tab) { viewPager.setCurrentItem(tab.getPosition()); From 282d6148b1e95b3280ebea3ea91a67768ffb122c Mon Sep 17 00:00:00 2001 From: Kyle Tee Date: Mon, 5 Aug 2019 13:18:01 +0200 Subject: [PATCH 3/6] Fix trailing category end tag in demo manifest. --- demo/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml index 693dfdc..8e1d7d5 100644 --- a/demo/src/main/AndroidManifest.xml +++ b/demo/src/main/AndroidManifest.xml @@ -32,7 +32,7 @@ - /> + From d5333b34c00bc5609b0819703dcdcfa4ee5db386 Mon Sep 17 00:00:00 2001 From: Kyle Tee Date: Mon, 5 Aug 2019 14:01:21 +0200 Subject: [PATCH 4/6] Add using the local library for release flavour as checks like lintVitalRelease fail. --- demo/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/demo/build.gradle b/demo/build.gradle index cd58365..7624a3b 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -51,9 +51,10 @@ android { dependencies { // debug builds should take the local code - debugImplementation project(':library') + implementation project(':library') implementation "com.android.support:appcompat-v7:28.0.0" // release builds should take the published artifact - releaseImplementation "com.1gravity:android-contactpicker:1.3.2" + // FIXME: When the release artifact is out of sync with the local library, this causes unwanted lintVitalRelease errors. + // releaseImplementation "com.1gravity:android-contactpicker:1.3.2" } From cdb606bd230dd39f0c6f5ebb43957a2a61a92327 Mon Sep 17 00:00:00 2001 From: Kyle Tee Date: Mon, 5 Aug 2019 14:03:57 +0200 Subject: [PATCH 5/6] Upgrade Android Gradle Plugin to v3.5.0-rc01 & gradle wrapper to v5.4.1-all. --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 32d8267..e8d8028 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0-rc01' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e12eb8c..575a2bc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip From e62471821c782aa8398a8f72d8b150e142395948 Mon Sep 17 00:00:00 2001 From: Kyle Tee Date: Mon, 5 Aug 2019 14:48:16 +0200 Subject: [PATCH 6/6] Migrate to AndroidX. --- demo/build.gradle | 6 +++--- .../onegravity/contactpicker/demo/BaseActivity.java | 4 ++-- gradle.properties | 2 ++ library/build.gradle | 12 ++++++------ .../com/onegravity/contactpicker/BaseFragment.java | 10 +++++----- .../contactpicker/contact/ContactAdapter.java | 2 +- .../contactpicker/contact/ContactFragment.java | 2 +- .../contactpicker/contact/ContactViewHolder.java | 2 +- .../contactpicker/core/ContactPickerActivity.java | 12 ++++++------ .../onegravity/contactpicker/core/PagerAdapter.java | 6 +++--- .../onegravity/contactpicker/group/GroupAdapter.java | 2 +- .../contactpicker/group/GroupViewHolder.java | 2 +- library/src/main/res/layout/cp_contact_list.xml | 2 +- .../src/main/res/layout/cp_contact_tab_layout.xml | 4 ++-- library/src/main/res/layout/cp_group_list.xml | 2 +- library/src/main/res/menu/cp_contact_picker.xml | 2 +- 16 files changed, 37 insertions(+), 35 deletions(-) diff --git a/demo/build.gradle b/demo/build.gradle index 7624a3b..5a63011 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -25,8 +25,8 @@ android { minSdkVersion 15 targetSdkVersion 28 - versionCode 10 - versionName "1.3.2" + versionCode 11 + versionName "1.4.0" } packagingOptions { @@ -53,7 +53,7 @@ dependencies { // debug builds should take the local code implementation project(':library') - implementation "com.android.support:appcompat-v7:28.0.0" + implementation 'androidx.appcompat:appcompat:1.0.0' // release builds should take the published artifact // FIXME: When the release artifact is out of sync with the local library, this causes unwanted lintVitalRelease errors. // releaseImplementation "com.1gravity:android-contactpicker:1.3.2" diff --git a/demo/src/main/java/com/onegravity/contactpicker/demo/BaseActivity.java b/demo/src/main/java/com/onegravity/contactpicker/demo/BaseActivity.java index d75e97a..a899fd8 100644 --- a/demo/src/main/java/com/onegravity/contactpicker/demo/BaseActivity.java +++ b/demo/src/main/java/com/onegravity/contactpicker/demo/BaseActivity.java @@ -24,8 +24,8 @@ import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import java.util.ArrayList; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/gradle.properties b/gradle.properties index 3069030..4e25315 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,3 +29,5 @@ POM_DEVELOPER_ID=1gravity POM_DEVELOPER_NAME=Emanuel Moecklin POM_DEVELOPER_EMAIL=1gravityllc@gmail.com POM_ISSUE_URL=https://github.com/1gravity/Android-ContactPicker/issues +android.useAndroidX=true +android.enableJetifier=true diff --git a/library/build.gradle b/library/build.gradle index ae9435a..7e4eda0 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -34,15 +34,15 @@ android { } dependencies { - implementation "com.android.support:appcompat-v7:$support_lib_version" + implementation 'androidx.appcompat:appcompat:1.0.0' - implementation "com.android.support:animated-vector-drawable:$support_lib_version" - implementation "com.android.support:support-v4:$support_lib_version" + implementation 'androidx.vectordrawable:vectordrawable-animated:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation "com.android.support:support-annotations:$support_lib_version" + implementation 'androidx.annotation:annotation:1.0.0' - implementation "com.android.support:recyclerview-v7:$support_lib_version" - implementation "com.android.support:design:$support_lib_version" + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' implementation "org.greenrobot:eventbus:$event_lib_version" diff --git a/library/src/main/java/com/onegravity/contactpicker/BaseFragment.java b/library/src/main/java/com/onegravity/contactpicker/BaseFragment.java index 47aa51a..86826f8 100644 --- a/library/src/main/java/com/onegravity/contactpicker/BaseFragment.java +++ b/library/src/main/java/com/onegravity/contactpicker/BaseFragment.java @@ -17,11 +17,11 @@ package com.onegravity.contactpicker; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SearchView; +import androidx.fragment.app.Fragment; +import androidx.core.view.MenuItemCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.SearchView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/library/src/main/java/com/onegravity/contactpicker/contact/ContactAdapter.java b/library/src/main/java/com/onegravity/contactpicker/contact/ContactAdapter.java index c34e0eb..49f9312 100644 --- a/library/src/main/java/com/onegravity/contactpicker/contact/ContactAdapter.java +++ b/library/src/main/java/com/onegravity/contactpicker/contact/ContactAdapter.java @@ -17,7 +17,7 @@ package com.onegravity.contactpicker.contact; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/onegravity/contactpicker/contact/ContactFragment.java b/library/src/main/java/com/onegravity/contactpicker/contact/ContactFragment.java index 2adb13f..c996532 100644 --- a/library/src/main/java/com/onegravity/contactpicker/contact/ContactFragment.java +++ b/library/src/main/java/com/onegravity/contactpicker/contact/ContactFragment.java @@ -17,7 +17,7 @@ package com.onegravity.contactpicker.contact; import android.os.Bundle; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/onegravity/contactpicker/contact/ContactViewHolder.java b/library/src/main/java/com/onegravity/contactpicker/contact/ContactViewHolder.java index 562c0f3..18c9056 100644 --- a/library/src/main/java/com/onegravity/contactpicker/contact/ContactViewHolder.java +++ b/library/src/main/java/com/onegravity/contactpicker/contact/ContactViewHolder.java @@ -18,7 +18,7 @@ import android.net.Uri; import android.provider.ContactsContract; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; diff --git a/library/src/main/java/com/onegravity/contactpicker/core/ContactPickerActivity.java b/library/src/main/java/com/onegravity/contactpicker/core/ContactPickerActivity.java index b0b7575..a1555c2 100644 --- a/library/src/main/java/com/onegravity/contactpicker/core/ContactPickerActivity.java +++ b/library/src/main/java/com/onegravity/contactpicker/core/ContactPickerActivity.java @@ -26,12 +26,12 @@ import android.net.Uri; import android.os.Bundle; import android.provider.ContactsContract; -import android.support.design.widget.TabLayout; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.tabs.TabLayout; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.util.TypedValue; import android.view.Menu; diff --git a/library/src/main/java/com/onegravity/contactpicker/core/PagerAdapter.java b/library/src/main/java/com/onegravity/contactpicker/core/PagerAdapter.java index bbcd4b3..2e2dc87 100644 --- a/library/src/main/java/com/onegravity/contactpicker/core/PagerAdapter.java +++ b/library/src/main/java/com/onegravity/contactpicker/core/PagerAdapter.java @@ -16,9 +16,9 @@ package com.onegravity.contactpicker.core; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import com.onegravity.contactpicker.contact.ContactDescription; import com.onegravity.contactpicker.contact.ContactFragment; diff --git a/library/src/main/java/com/onegravity/contactpicker/group/GroupAdapter.java b/library/src/main/java/com/onegravity/contactpicker/group/GroupAdapter.java index f4f457b..44fd0cc 100644 --- a/library/src/main/java/com/onegravity/contactpicker/group/GroupAdapter.java +++ b/library/src/main/java/com/onegravity/contactpicker/group/GroupAdapter.java @@ -17,7 +17,7 @@ package com.onegravity.contactpicker.group; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/library/src/main/java/com/onegravity/contactpicker/group/GroupViewHolder.java b/library/src/main/java/com/onegravity/contactpicker/group/GroupViewHolder.java index 4ce7c7f..5e468b4 100644 --- a/library/src/main/java/com/onegravity/contactpicker/group/GroupViewHolder.java +++ b/library/src/main/java/com/onegravity/contactpicker/group/GroupViewHolder.java @@ -17,7 +17,7 @@ package com.onegravity.contactpicker.group; import android.content.res.Resources; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; diff --git a/library/src/main/res/layout/cp_contact_list.xml b/library/src/main/res/layout/cp_contact_list.xml index d7799fb..0ecd394 100644 --- a/library/src/main/res/layout/cp_contact_list.xml +++ b/library/src/main/res/layout/cp_contact_list.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - diff --git a/library/src/main/res/layout/cp_group_list.xml b/library/src/main/res/layout/cp_group_list.xml index bc3c446..4f311a6 100644 --- a/library/src/main/res/layout/cp_group_list.xml +++ b/library/src/main/res/layout/cp_group_list.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> -