Revert "Using SDK Version variables from root project"

This commit is contained in:
Hampton Maxwell 2018-06-21 09:18:12 -07:00 committed by GitHub
parent d3d1947beb
commit 7511487baf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 29 deletions

View File

@ -1,28 +1,17 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
def _ext = rootProject.ext
def _reactNativeVersion = _ext.has('reactNative') ? _ext.reactNative : '+'
def _compileSdkVersion = _ext.has('compileSdkVersion') ? _ext.compileSdkVersion : 27
def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : '27.0.3'
def _minSdkVersion = _ext.has('minSdkVersion') ? _ext.minSdkVersion : 16
def _targetSdkVersion = _ext.has('targetSdkVersion') ? _ext.targetSdkVersion : 27
android { android {
compileSdkVersion _compileSdkVersion compileSdkVersion 23
buildToolsVersion _buildToolsVersion buildToolsVersion "25.0.2"
defaultConfig { defaultConfig {
minSdkVersion _minSdkVersion minSdkVersion 16
targetSdkVersion _targetSdkVersion targetSdkVersion 23
versionCode 1
versionName "1.0"
} }
} }
dependencies { dependencies {
//noinspection GradleDynamicVersion provided 'com.facebook.react:react-native:+'
provided "com.facebook.react:react-native:${_reactNativeVersion}"
compile 'com.google.android.exoplayer:exoplayer:2.7.3' compile 'com.google.android.exoplayer:exoplayer:2.7.3'
compile('com.google.android.exoplayer:extension-okhttp:2.7.3') { compile('com.google.android.exoplayer:extension-okhttp:2.7.3') {
exclude group: 'com.squareup.okhttp3', module: 'okhttp' exclude group: 'com.squareup.okhttp3', module: 'okhttp'

View File

@ -1,20 +1,12 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
def _ext = rootProject.ext
def _reactNativeVersion = _ext.has('reactNative') ? _ext.reactNative : '+'
def _compileSdkVersion = _ext.has('compileSdkVersion') ? _ext.compileSdkVersion : 27
def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : '27.0.3'
def _minSdkVersion = _ext.has('minSdkVersion') ? _ext.minSdkVersion : 16
def _targetSdkVersion = _ext.has('targetSdkVersion') ? _ext.targetSdkVersion : 27
android { android {
compileSdkVersion _compileSdkVersion compileSdkVersion 25
buildToolsVersion _buildToolsVersion buildToolsVersion "25.0.2"
defaultConfig { defaultConfig {
minSdkVersion _minSdkVersion minSdkVersion 16
targetSdkVersion _targetSdkVersion targetSdkVersion 25
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
ndk { ndk {
@ -25,6 +17,6 @@ android {
dependencies { dependencies {
//noinspection GradleDynamicVersion //noinspection GradleDynamicVersion
provided "com.facebook.react:react-native:${_reactNativeVersion}" provided 'com.facebook.react:react-native:+'
compile 'com.yqritc:android-scalablevideoview:1.0.4' compile 'com.yqritc:android-scalablevideoview:1.0.4'
} }