From 20f9c291cd47b34c52498d3c3ca3439cbaea6a2a Mon Sep 17 00:00:00 2001 From: Hampton Maxwell Date: Thu, 21 Jun 2018 10:29:38 -0700 Subject: [PATCH] Revert "Revert "Using SDK Version variables from root project"" --- android-exoplayer/build.gradle | 21 ++++++++++++++++----- android/build.gradle | 18 +++++++++++++----- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/android-exoplayer/build.gradle b/android-exoplayer/build.gradle index 9aeaa593..a957dd62 100644 --- a/android-exoplayer/build.gradle +++ b/android-exoplayer/build.gradle @@ -1,17 +1,28 @@ 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 { - compileSdkVersion 23 - buildToolsVersion "25.0.2" + compileSdkVersion _compileSdkVersion + buildToolsVersion _buildToolsVersion defaultConfig { - minSdkVersion 16 - targetSdkVersion 23 + minSdkVersion _minSdkVersion + targetSdkVersion _targetSdkVersion + versionCode 1 + versionName "1.0" } } dependencies { - provided 'com.facebook.react:react-native:+' + //noinspection GradleDynamicVersion + provided "com.facebook.react:react-native:${_reactNativeVersion}" compile 'com.google.android.exoplayer:exoplayer:2.7.3' compile('com.google.android.exoplayer:extension-okhttp:2.7.3') { exclude group: 'com.squareup.okhttp3', module: 'okhttp' diff --git a/android/build.gradle b/android/build.gradle index 922bd9e3..789f4345 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,20 @@ 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 { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion _compileSdkVersion + buildToolsVersion _buildToolsVersion defaultConfig { - minSdkVersion 16 - targetSdkVersion 25 + minSdkVersion _minSdkVersion + targetSdkVersion _targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -17,6 +25,6 @@ android { dependencies { //noinspection GradleDynamicVersion - provided 'com.facebook.react:react-native:+' + provided "com.facebook.react:react-native:${_reactNativeVersion}" compile 'com.yqritc:android-scalablevideoview:1.0.4' }