haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Android] Fix Android Studio 3.0 Beta 7

This commit is contained in:
Lyubo Marinov 2017-10-03 20:44:49 -05:00
parent c2ca345dec
commit e0b73fdd1c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/app/build.gradle
View File

@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig { defaultConfig {
applicationId 'org.jitsi.meet' applicationId 'org.jitsi.meet'

12
android/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-beta6' classpath 'com.android.tools.build:gradle:3.0.0-beta7'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files. // in the individual module build.gradle files.
@ -58,7 +58,9 @@ allprojects {
project.android { project.android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion if (rootProject.ext.has('buildToolsVersion')) {
buildToolsVersion rootProject.ext.buildToolsVersion
}
defaultConfig { defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
@ -129,7 +131,6 @@ allprojects {
ext { ext {
compileSdkVersion = 25 compileSdkVersion = 25
buildToolsVersion = "25.0.3"
minSdkVersion = 16 minSdkVersion = 16
targetSdkVersion = 25 targetSdkVersion = 25
@ -145,8 +146,9 @@ ext {
// modules that we utilize such as react-native-background-timer. // modules that we utilize such as react-native-background-timer.
subprojects { subproject -> subprojects { subproject ->
afterEvaluate{ afterEvaluate{
if (subproject.plugins.hasPlugin('android') if ((subproject.plugins.hasPlugin('android')
|| subproject.plugins.hasPlugin('android-library')) { || subproject.plugins.hasPlugin('android-library'))
&& rootProject.ext.has('buildToolsVersion')) {
android { android {
buildToolsVersion rootProject.ext.buildToolsVersion buildToolsVersion rootProject.ext.buildToolsVersion
} }

1
android/sdk/build.gradle
View File

@ -3,7 +3,6 @@ apply plugin: 'maven-publish'
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig { defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion