Преглед на файлове

[Android] Fix Android Studio 3.0 Beta 7

master
Lyubo Marinov преди 7 години
родител
ревизия
e0b73fdd1c
променени са 3 файла, в които са добавени 7 реда и са изтрити 7 реда
  1. 0
    1
      android/app/build.gradle
  2. 7
    5
      android/build.gradle
  3. 0
    1
      android/sdk/build.gradle

+ 0
- 1
android/app/build.gradle Целия файл

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

+ 7
- 5
android/build.gradle Целия файл

@@ -7,7 +7,7 @@ buildscript {
7 7
         maven { url 'https://maven.google.com' }
8 8
     }
9 9
     dependencies {
10
-        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
10
+        classpath 'com.android.tools.build:gradle:3.0.0-beta7'
11 11
 
12 12
         // NOTE: Do not place your application dependencies here; they belong
13 13
         // in the individual module build.gradle files.
@@ -58,7 +58,9 @@ allprojects {
58 58
 
59 59
             project.android {
60 60
                 compileSdkVersion rootProject.ext.compileSdkVersion
61
-                buildToolsVersion rootProject.ext.buildToolsVersion
61
+                if (rootProject.ext.has('buildToolsVersion')) {
62
+                    buildToolsVersion rootProject.ext.buildToolsVersion
63
+                }
62 64
                 defaultConfig {
63 65
                     minSdkVersion rootProject.ext.minSdkVersion
64 66
                     targetSdkVersion rootProject.ext.targetSdkVersion
@@ -129,7 +131,6 @@ allprojects {
129 131
 
130 132
 ext {
131 133
     compileSdkVersion = 25
132
-    buildToolsVersion = "25.0.3"
133 134
     minSdkVersion    = 16
134 135
     targetSdkVersion = 25
135 136
 
@@ -145,8 +146,9 @@ ext {
145 146
 // modules that we utilize such as react-native-background-timer.
146 147
 subprojects { subproject ->
147 148
     afterEvaluate{
148
-        if (subproject.plugins.hasPlugin('android')
149
-                || subproject.plugins.hasPlugin('android-library')) {
149
+        if ((subproject.plugins.hasPlugin('android')
150
+                    || subproject.plugins.hasPlugin('android-library'))
151
+                && rootProject.ext.has('buildToolsVersion')) {
150 152
             android {
151 153
                 buildToolsVersion rootProject.ext.buildToolsVersion
152 154
             }

+ 0
- 1
android/sdk/build.gradle Целия файл

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

Loading…
Отказ
Запис