Skip to content

Commit 0414d63

Browse files
authored
Merge pull request #1080 from react-native-community/revert-999-master
Revert "Using SDK Version variables from root project"
2 parents d3d1947 + 7511487 commit 0414d63

File tree

2 files changed

+10
-29
lines changed

2 files changed

+10
-29
lines changed

android-exoplayer/build.gradle

+5-16
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,17 @@
11
apply plugin: 'com.android.library'
22

3-
def _ext = rootProject.ext
4-
5-
def _reactNativeVersion = _ext.has('reactNative') ? _ext.reactNative : '+'
6-
def _compileSdkVersion = _ext.has('compileSdkVersion') ? _ext.compileSdkVersion : 27
7-
def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : '27.0.3'
8-
def _minSdkVersion = _ext.has('minSdkVersion') ? _ext.minSdkVersion : 16
9-
def _targetSdkVersion = _ext.has('targetSdkVersion') ? _ext.targetSdkVersion : 27
10-
113
android {
12-
compileSdkVersion _compileSdkVersion
13-
buildToolsVersion _buildToolsVersion
4+
compileSdkVersion 23
5+
buildToolsVersion "25.0.2"
146

157
defaultConfig {
16-
minSdkVersion _minSdkVersion
17-
targetSdkVersion _targetSdkVersion
18-
versionCode 1
19-
versionName "1.0"
8+
minSdkVersion 16
9+
targetSdkVersion 23
2010
}
2111
}
2212

2313
dependencies {
24-
//noinspection GradleDynamicVersion
25-
provided "com.facebook.react:react-native:${_reactNativeVersion}"
14+
provided 'com.facebook.react:react-native:+'
2615
compile 'com.google.android.exoplayer:exoplayer:2.7.3'
2716
compile('com.google.android.exoplayer:extension-okhttp:2.7.3') {
2817
exclude group: 'com.squareup.okhttp3', module: 'okhttp'

android/build.gradle

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
apply plugin: 'com.android.library'
22

3-
def _ext = rootProject.ext
4-
5-
def _reactNativeVersion = _ext.has('reactNative') ? _ext.reactNative : '+'
6-
def _compileSdkVersion = _ext.has('compileSdkVersion') ? _ext.compileSdkVersion : 27
7-
def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : '27.0.3'
8-
def _minSdkVersion = _ext.has('minSdkVersion') ? _ext.minSdkVersion : 16
9-
def _targetSdkVersion = _ext.has('targetSdkVersion') ? _ext.targetSdkVersion : 27
10-
113
android {
12-
compileSdkVersion _compileSdkVersion
13-
buildToolsVersion _buildToolsVersion
4+
compileSdkVersion 25
5+
buildToolsVersion "25.0.2"
146

157
defaultConfig {
16-
minSdkVersion _minSdkVersion
17-
targetSdkVersion _targetSdkVersion
8+
minSdkVersion 16
9+
targetSdkVersion 25
1810
versionCode 1
1911
versionName "1.0"
2012
ndk {
@@ -25,6 +17,6 @@ android {
2517

2618
dependencies {
2719
//noinspection GradleDynamicVersion
28-
provided "com.facebook.react:react-native:${_reactNativeVersion}"
20+
provided 'com.facebook.react:react-native:+'
2921
compile 'com.yqritc:android-scalablevideoview:1.0.4'
3022
}

0 commit comments

Comments
 (0)