Update dependencies + Kotlin 1.4.0 + Fix lint (#431)

Author: ZacSweers

gradle/dependencies.gradle

@@ -15,22 +15,22 @@
  */
 
 def versions = [
-    androidTest: '1.3.0-alpha02',
+    androidTest: '1.3.0-alpha03',
     animalSniffer: '1.5.0',
-    androidxLifecycle: '2.1.0',
+    androidxLifecycle: '2.2.0',
     dokka: '0.9.18',
-    errorProne: '2.3.3',
+    errorProne: '2.4.0',
     errorPronePlugin: '0.7.1',
     gjf: '1.7',
     nullawayPlugin: '0.1',
-    kotlin: '1.3.50',
-    lint: '26.5.2',
+    kotlin: '1.4.0',
+    lint: '27.0.1',
     ktlint: '0.35.0',
     spotless: '3.25.0'
 ]
 
 def apt = [
-    autoService: "com.google.auto.service:auto-service:1.0-rc6"
+    autoService: "com.google.auto.service:auto-service:1.0-rc7"
 ]
 
 def build = [
@@ -44,11 +44,11 @@ def build = [
     errorProneJavac: "com.google.errorprone:javac:9+181-r4173-1",
     errorProneCheckApi: "com.google.errorprone:error_prone_check_api:${versions.errorProne}",
     errorProneTestHelpers: "com.google.errorprone:error_prone_test_helpers:${versions.errorProne}",
-    nullAway: 'com.uber.nullaway:nullaway:0.7.5',
+    nullAway: 'com.uber.nullaway:nullaway:0.8.0',
     animalSniffer: 'org.codehaus.mojo.signature:java17:1.0@signature',
 
     gradlePlugins: [
-        android: 'com.android.tools.build:gradle:3.6.0-rc01',
+        android: 'com.android.tools.build:gradle:4.0.1',
         dokka: "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}",
         dokkaAndroid: "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}",
         kotlin: "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
@@ -62,7 +62,7 @@ def build = [
 ]
 
 def kotlin = [
-    coroutines: "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.1",
+    coroutines: "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9",
     stdlib: "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
 ]
 
@@ -77,7 +77,7 @@ def rx = [
 ]
 
 def androidx = [
-    annotations: "androidx.annotation:annotation:1.0.2",
+    annotations: "androidx.annotation:annotation:1.1.0",
     lifecycle: [
         compiler: "androidx.lifecycle:lifecycle-compiler:${versions.androidxLifecycle}",
         common: "androidx.lifecycle:lifecycle-common:${versions.androidxLifecycle}",
@@ -86,12 +86,12 @@ def androidx = [
 ]
 
 def test = [
-    androidExtJunit: "androidx.test.ext:junit:1.1.2-alpha02",
+    androidExtJunit: "androidx.test.ext:junit:1.1.2-rc03",
     androidRunner: "androidx.test:runner:${versions.androidTest}",
     androidRules: "androidx.test:rules:${versions.androidTest}",
     androidOrchestrator: "androidx.test:orchestrator:${versions.androidTest}",
-    junit: 'junit:junit:4.12',
-    truth: 'com.google.truth:truth:1.0'
+    junit: 'junit:junit:4.13',
+    truth: 'com.google.truth:truth:1.0.1'
 ]
 
 ext.deps = [

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -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

gradlew

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -23,6 +23,13 @@ plugins {
 sourceCompatibility = deps.build.javaVersion
 targetCompatibility = deps.build.javaVersion
 
+compileKotlin {
+  kotlinOptions {
+    // Lint runs with 1.3 still, so we need to emit 1.3-compatible code
+    languageVersion = "1.3"
+  }
+}
+
 dependencies {
   kapt deps.apt.autoService
 

static-analysis/autodispose-lint/build.gradle

@@ -132,7 +132,7 @@ class AutoDisposeDetector : Detector(), SourceCodeScanner {
         overrideScopes = it
       }
     }
-    // If scopes are not overriden, add the default ones.
+    // If scopes are not overridden, add the default ones.
     if (!overrideScopes) {
       scopes.addAll(DEFAULT_SCOPES)
     }