浏览代码

[Android] Fix Android Studio 3.0 Beta 7

j8
Lyubo Marinov 8 年前
父节点
当前提交
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
 
2
 
3
 android {
3
 android {
4
     compileSdkVersion rootProject.ext.compileSdkVersion
4
     compileSdkVersion rootProject.ext.compileSdkVersion
5
-    buildToolsVersion rootProject.ext.buildToolsVersion
6
 
5
 
7
     defaultConfig {
6
     defaultConfig {
8
         applicationId 'org.jitsi.meet'
7
         applicationId 'org.jitsi.meet'

+ 7
- 5
android/build.gradle 查看文件

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

+ 0
- 1
android/sdk/build.gradle 查看文件

3
 
3
 
4
 android {
4
 android {
5
     compileSdkVersion rootProject.ext.compileSdkVersion
5
     compileSdkVersion rootProject.ext.compileSdkVersion
6
-    buildToolsVersion rootProject.ext.buildToolsVersion
7
 
6
 
8
     defaultConfig {
7
     defaultConfig {
9
         minSdkVersion rootProject.ext.minSdkVersion
8
         minSdkVersion rootProject.ext.minSdkVersion

正在加载...
取消
保存