Merge pull request #488 from nielsvanvelzen/android-builds-tools-upgrade

Upgrade Android build tools
This commit is contained in:
Bill Thornton
2020-05-31 10:20:44 -04:00
committed by GitHub
6 changed files with 7 additions and 3 deletions

View File

@@ -4,11 +4,12 @@
<issue id="DuplicateStrings" severity="warning" />
<issue id="EasterEgg" severity="fatal" />
<issue id="MangledCRLF" severity="warning" />
<issue id="MissingRegistered" severity="fatal" />
<issue id="NegativeMargin" severity="warning" />
<issue id="NoHardKeywords" severity="warning" />
<issue id="Registered" severity="warning" />
<issue id="RequiredSize" severity="error" />
<issue id="UnknownNullness" severity="informational" />
<issue id="UnusedIds" severity="warning" />
<issue id="KotlinPropertyAccess" severity="warning" />
<issue id="LambdaLast" severity="warning" />
</lint>

View File

@@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:3.6.2")
classpath("com.android.tools.build:gradle:4.0.0")
classpath(kotlin("gradle-plugin", "1.3.72"))
}
}

Binary file not shown.

View File

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

2
gradlew vendored
View File

@@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath

1
gradlew.bat vendored
View File

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%