From e27b068b516d0a030d6b475140d3049c500eeb41 Mon Sep 17 00:00:00 2001 From: Kacper Kafara Date: Mon, 18 Jul 2022 17:39:36 +0200 Subject: [PATCH] chore: drop React Native 0.62, 0.63 since 3.14.0 (#1533) * docs: add note to main readme Since 3.15.0 we support React Native 0.64+ * chore: set minSdkVersion to 21 * chore: remove unnecessary check for API version in Android code Due to https://apilevels.com/ Build.VERSION_CODES.LOLIPOP is API version 21 --> from now on this condition is redundant * chore: remove obsolete check for Android API version According to https://apilevels.com/ JELLY_BEAN_MR1 is API version 17 --> this check is now obsolete. So is the annotation. --- README.md | 1 + android/build.gradle | 2 +- .../java/com/swmansion/rnscreens/ScreenStackHeaderConfig.kt | 3 +-- .../main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ed5b8954bf..9b2cf15cad 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ Screens are already integrated with the React Native's most popular navigation l | version | react-native version | | ------- | -------------------- | +| 3.14.0+ | 0.64.0+ | | 3.0.0+ | 0.62.0+ | | 2.0.0+ | 0.60.0+ | diff --git a/android/build.gradle b/android/build.gradle index 0d480d41ce..4ee29300f4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -50,7 +50,7 @@ android { } defaultConfig { - minSdkVersion safeExtGet('minSdkVersion', 16) + minSdkVersion safeExtGet('minSdkVersion', 21) targetSdkVersion safeExtGet('targetSdkVersion', 22) versionCode 1 versionName "1.0" diff --git a/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfig.kt b/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfig.kt index 28761b17d7..5b3e0080cd 100644 --- a/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfig.kt +++ b/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfig.kt @@ -130,7 +130,6 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) { return null } - @SuppressLint("ObsoleteSdkInt") // to be removed when support for < 0.64 is dropped fun onUpdate() { val stack = screenStack val isTop = stack == null || stack.topScreen == parent @@ -138,7 +137,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) { return } val activity = screenFragment?.activity as AppCompatActivity? ?: return - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && mDirection != null) { + if (mDirection != null) { if (mDirection == "rtl") { toolbar.layoutDirection = LAYOUT_DIRECTION_RTL } else if (mDirection == "ltr") { diff --git a/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt b/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt index 1c990fb135..e8ea668ca8 100644 --- a/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt +++ b/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt @@ -48,7 +48,7 @@ object ScreenWindowTraits { @SuppressLint("ObsoleteSdkInt") // to be removed when support for < 0.64 is dropped internal fun setColor(screen: Screen, activity: Activity?, context: ReactContext?) { - if (activity == null || context == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { + if (activity == null || context == null) { return } if (mDefaultStatusBarColor == null) {