react-native-navigation 7.38.5 → 7.39.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -66,7 +66,11 @@ android {
|
|
|
66
66
|
targetCompatibility JavaVersion.VERSION_1_8
|
|
67
67
|
}
|
|
68
68
|
kotlinOptions {
|
|
69
|
-
|
|
69
|
+
if (reactNativeMinorVersion() >= 73) {
|
|
70
|
+
jvmTarget = JavaVersion.VERSION_17
|
|
71
|
+
} else {
|
|
72
|
+
jvmTarget = JavaVersion.VERSION_11
|
|
73
|
+
}
|
|
70
74
|
}
|
|
71
75
|
|
|
72
76
|
flavorDimensions "RNN.reactNativeVersion"
|
|
@@ -122,6 +126,11 @@ android {
|
|
|
122
126
|
}
|
|
123
127
|
}
|
|
124
128
|
|
|
129
|
+
int reactNativeMinorVersion() {
|
|
130
|
+
List reactNativeVersionComponents = reactNativeVersionComponents(findReactNativePackageJson())
|
|
131
|
+
reactNativeVersionComponents[1].toInteger()
|
|
132
|
+
}
|
|
133
|
+
|
|
125
134
|
String resolveFlavor() {
|
|
126
135
|
List reactNativeVersionComponents = reactNativeVersionComponents(findReactNativePackageJson())
|
|
127
136
|
Integer reactNativeMinorComponent = reactNativeVersionComponents[1].toInteger()
|
|
@@ -134,6 +134,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
|
|
|
134
134
|
|
|
135
135
|
@Override
|
|
136
136
|
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
|
|
137
|
+
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
|
137
138
|
NavigationApplication.instance.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
|
138
139
|
if (mPermissionListener != null && mPermissionListener.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
|
|
139
140
|
mPermissionListener = null;
|