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