From 71f969e6247de465fc3ec03d61156be2dd83e286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Fro=CC=88lich?= Date: Tue, 19 Feb 2019 10:01:20 +0100 Subject: [PATCH 1/4] Use the sdk- and buildtools-versions from root project --- android/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index 40f4f265c..4d2c55756 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,9 @@ apply plugin: 'com.android.library' +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} + android { compileSdkVersion 27 buildToolsVersion "23.0.1" From 8512582fdc66fc223ce71240cd818e51b21cb4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Fro=CC=88lich?= Date: Tue, 19 Feb 2019 10:01:20 +0100 Subject: [PATCH 2/4] Use the sdk- and buildtools-versions from root project --- android/build.gradle | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 40f4f265c..682d425bf 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,16 @@ apply plugin: 'com.android.library' +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} + android { - compileSdkVersion 27 - buildToolsVersion "23.0.1" + compileSdkVersion safeExtGet('compileSdkVersion', 27) + buildToolsVersion safeExtGet('buildToolsVersion', '23.0.1') defaultConfig { - minSdkVersion 16 - targetSdkVersion 27 + minSdkVersion safeExtGet('minSdkVersion', 16) + targetSdkVersion safeExtGet('targetSdkVersion', 27) versionCode 1 versionName "1.0" From 59e02442572935c86b5223d55bd81b6d39cf04c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Fro=CC=88lich?= <695826+jan-happy@users.noreply.github.com> Date: Thu, 5 Sep 2019 14:11:36 +0200 Subject: [PATCH 3/4] update android support library to androidx --- android/src/main/java/com/beefe/picker/PickerViewModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/beefe/picker/PickerViewModule.java b/android/src/main/java/com/beefe/picker/PickerViewModule.java index 813a0bddf..73ad13732 100644 --- a/android/src/main/java/com/beefe/picker/PickerViewModule.java +++ b/android/src/main/java/com/beefe/picker/PickerViewModule.java @@ -6,7 +6,7 @@ import android.graphics.Color; import android.graphics.PixelFormat; import android.graphics.Typeface; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.Gravity; import android.view.View; From 5cb441800d6d938f6b1df21301c4d54b6865b9e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Fro=CC=88lich?= <695826+jan-happy@users.noreply.github.com> Date: Thu, 5 Sep 2019 14:55:01 +0200 Subject: [PATCH 4/4] Rollback --- android/src/main/java/com/beefe/picker/PickerViewModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/beefe/picker/PickerViewModule.java b/android/src/main/java/com/beefe/picker/PickerViewModule.java index 73ad13732..813a0bddf 100644 --- a/android/src/main/java/com/beefe/picker/PickerViewModule.java +++ b/android/src/main/java/com/beefe/picker/PickerViewModule.java @@ -6,7 +6,7 @@ import android.graphics.Color; import android.graphics.PixelFormat; import android.graphics.Typeface; -import androidx.annotation.Nullable; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.Gravity; import android.view.View;