浏览代码

AS Arctic Fox | 2020.3.1 Update to Gradle/AGP 7.0.2
Removed obsolete DSL element 'dexOptions'

It will be removed in version 8.0 of the Android Gradle plugin.
Using it has no effect, and the AndroidGradle plugin optimizes dexing automatically.

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

Andy Scherzinger 3 年之前
父节点
当前提交
504366d7db
共有 2 个文件被更改,包括 2 次插入6 次删除
  1. 1 5
      build.gradle
  2. 1 1
      gradle/wrapper/gradle-wrapper.properties

+ 1 - 5
build.gradle

@@ -18,7 +18,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath 'com.hiya:jacoco-android:0.2'
         classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -118,10 +118,6 @@ android {
             'InvalidPeriodicWorkRequestInterval' // crashes due to a bug in lint itself
     }
 
-    dexOptions {
-        javaMaxHeapSize "4g"
-    }
-
     compileSdkVersion 29
 
     defaultConfig {

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists