Bump Kotlin version in templates and projects (#92052)
diff --git a/dev/benchmarks/complex_layout/android/build.gradle b/dev/benchmarks/complex_layout/android/build.gradle
index 013824e..77683ab 100644
--- a/dev/benchmarks/complex_layout/android/build.gradle
+++ b/dev/benchmarks/complex_layout/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile b/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile
index 969a5de..098cb4b 100644
--- a/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile
+++ b/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile
@@ -64,7 +64,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
io.grpc:grpc-api:1.21.1=classpath
io.grpc:grpc-context:1.21.1=classpath
io.grpc:grpc-core:1.21.1=classpath
@@ -92,7 +92,6 @@
net.java.dev.jna:jna:5.6.0=classpath
net.sf.jopt-simple:jopt-simple:4.9=classpath
net.sf.kxml:kxml2:2.3.0=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.20=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -106,29 +105,33 @@
org.glassfish.jaxb:txw2:2.3.2=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
org.jvnet.staxex:stax-ex:1.8.1=classpath
diff --git a/dev/benchmarks/macrobenchmarks/android/build.gradle b/dev/benchmarks/macrobenchmarks/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/benchmarks/macrobenchmarks/android/build.gradle
+++ b/dev/benchmarks/macrobenchmarks/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile b/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile
+++ b/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/benchmarks/platform_views_layout/android/build.gradle b/dev/benchmarks/platform_views_layout/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/benchmarks/platform_views_layout/android/build.gradle
+++ b/dev/benchmarks/platform_views_layout/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile b/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile
+++ b/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle b/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle
+++ b/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile b/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile
+++ b/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/benchmarks/test_apps/stocks/android/build.gradle b/dev/benchmarks/test_apps/stocks/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/benchmarks/test_apps/stocks/android/build.gradle
+++ b/dev/benchmarks/test_apps/stocks/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile b/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile
+++ b/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/abstract_method_smoke_test/android/build.gradle b/dev/integration_tests/abstract_method_smoke_test/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/abstract_method_smoke_test/android/build.gradle
+++ b/dev/integration_tests/abstract_method_smoke_test/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/abstract_method_smoke_test/android/buildscript-gradle.lockfile b/dev/integration_tests/abstract_method_smoke_test/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/abstract_method_smoke_test/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/abstract_method_smoke_test/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/abstract_method_smoke_test/android/project-app.lockfile b/dev/integration_tests/abstract_method_smoke_test/android/project-app.lockfile
index 3c50dcc..a135c00 100644
--- a/dev/integration_tests/abstract_method_smoke_test/android/project-app.lockfile
+++ b/dev/integration_tests/abstract_method_smoke_test/android/project-app.lockfile
@@ -84,19 +84,19 @@
org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
org.glassfish.jaxb:txw2:2.3.1=lintClassPath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.4.32=kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.5.31=kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-script-runtime:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.5.31=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.trove4j:trove4j:20160824=lintClassPath
org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jvnet.staxex:stax-ex:1.8=lintClassPath
@@ -105,4 +105,4 @@
org.ow2.asm:asm-tree:7.0=lintClassPath
org.ow2.asm:asm-util:7.0=lintClassPath
org.ow2.asm:asm:7.0=lintClassPath
-empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
+empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugIntransitiveDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestIntransitiveDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileIntransitiveDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseIntransitiveDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestIntransitiveDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugIntransitiveDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestIntransitiveDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathDebug,kotlinCompilerPluginClasspathDebugAndroidTest,kotlinCompilerPluginClasspathDebugUnitTest,kotlinCompilerPluginClasspathProfile,kotlinCompilerPluginClasspathProfileUnitTest,kotlinCompilerPluginClasspathRelease,kotlinCompilerPluginClasspathReleaseUnitTest,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileIntransitiveDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestIntransitiveDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseIntransitiveDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestIntransitiveDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugIntransitiveDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileIntransitiveDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseIntransitiveDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
diff --git a/dev/integration_tests/android_embedding_v2_smoke_test/android/build.gradle b/dev/integration_tests/android_embedding_v2_smoke_test/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/android_embedding_v2_smoke_test/android/build.gradle
+++ b/dev/integration_tests/android_embedding_v2_smoke_test/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/android_embedding_v2_smoke_test/android/buildscript-gradle.lockfile b/dev/integration_tests/android_embedding_v2_smoke_test/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/android_embedding_v2_smoke_test/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/android_embedding_v2_smoke_test/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/android_embedding_v2_smoke_test/android/project-app.lockfile b/dev/integration_tests/android_embedding_v2_smoke_test/android/project-app.lockfile
index 7d09953..0a2d8d4 100644
--- a/dev/integration_tests/android_embedding_v2_smoke_test/android/project-app.lockfile
+++ b/dev/integration_tests/android_embedding_v2_smoke_test/android/project-app.lockfile
@@ -84,19 +84,19 @@
org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
org.glassfish.jaxb:txw2:2.3.1=lintClassPath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.4.32=kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.5.31=kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-script-runtime:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.5.31=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.trove4j:trove4j:20160824=lintClassPath
org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jvnet.staxex:stax-ex:1.8=lintClassPath
@@ -105,4 +105,4 @@
org.ow2.asm:asm-tree:7.0=lintClassPath
org.ow2.asm:asm-util:7.0=lintClassPath
org.ow2.asm:asm:7.0=lintClassPath
-empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
+empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugIntransitiveDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestIntransitiveDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileIntransitiveDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseIntransitiveDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestIntransitiveDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugIntransitiveDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestIntransitiveDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathDebug,kotlinCompilerPluginClasspathDebugAndroidTest,kotlinCompilerPluginClasspathDebugUnitTest,kotlinCompilerPluginClasspathProfile,kotlinCompilerPluginClasspathProfileUnitTest,kotlinCompilerPluginClasspathRelease,kotlinCompilerPluginClasspathReleaseUnitTest,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileIntransitiveDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestIntransitiveDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseIntransitiveDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestIntransitiveDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugIntransitiveDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileIntransitiveDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseIntransitiveDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
diff --git a/dev/integration_tests/android_semantics_testing/android/build.gradle b/dev/integration_tests/android_semantics_testing/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/android_semantics_testing/android/build.gradle
+++ b/dev/integration_tests/android_semantics_testing/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/android_semantics_testing/android/buildscript-gradle.lockfile b/dev/integration_tests/android_semantics_testing/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/android_semantics_testing/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/android_semantics_testing/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/android_views/android/build.gradle b/dev/integration_tests/android_views/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/android_views/android/build.gradle
+++ b/dev/integration_tests/android_views/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/android_views/android/buildscript-gradle.lockfile b/dev/integration_tests/android_views/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/android_views/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/android_views/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/channels/android/build.gradle b/dev/integration_tests/channels/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/channels/android/build.gradle
+++ b/dev/integration_tests/channels/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/channels/android/buildscript-gradle.lockfile b/dev/integration_tests/channels/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/channels/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/channels/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/external_ui/android/build.gradle b/dev/integration_tests/external_ui/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/external_ui/android/build.gradle
+++ b/dev/integration_tests/external_ui/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/external_ui/android/buildscript-gradle.lockfile b/dev/integration_tests/external_ui/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/external_ui/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/external_ui/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/flavors/android/build.gradle b/dev/integration_tests/flavors/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/flavors/android/build.gradle
+++ b/dev/integration_tests/flavors/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/flavors/android/buildscript-gradle.lockfile b/dev/integration_tests/flavors/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/flavors/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/flavors/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/flutter_gallery/android/build.gradle b/dev/integration_tests/flutter_gallery/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/flutter_gallery/android/build.gradle
+++ b/dev/integration_tests/flutter_gallery/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile b/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/gradle_deprecated_settings/android/build.gradle b/dev/integration_tests/gradle_deprecated_settings/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/gradle_deprecated_settings/android/build.gradle
+++ b/dev/integration_tests/gradle_deprecated_settings/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/gradle_deprecated_settings/android/buildscript-gradle.lockfile b/dev/integration_tests/gradle_deprecated_settings/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/gradle_deprecated_settings/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/gradle_deprecated_settings/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/gradle_deprecated_settings/android/project-camera.lockfile b/dev/integration_tests/gradle_deprecated_settings/android/project-camera.lockfile
index 14c9444..33a2d00 100644
--- a/dev/integration_tests/gradle_deprecated_settings/android/project-camera.lockfile
+++ b/dev/integration_tests/gradle_deprecated_settings/android/project-camera.lockfile
@@ -17,8 +17,13 @@
androidx.lifecycle:lifecycle-viewmodel:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.test:core:1.3.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.test:monitor:1.3.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+backport-util-concurrent:backport-util-concurrent:3.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+classworlds:classworlds:1.1-alpha-2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.almworks.sqlite4java:sqlite4java:0.282=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.android.tools.analytics-library:protos:27.1.3=lintClassPath
com.android.tools.analytics-library:shared:27.1.3=lintClassPath
com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
@@ -50,16 +55,24 @@
com.android.tools:sdklib:27.1.3=lintClassPath
com.android:signflinger:4.1.3=lintClassPath
com.android:zipflinger:4.1.3=lintClassPath
-com.google.code.findbugs:jsr305:3.0.2=lintClassPath
+com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.auto.service:auto-service:1.0-rc4=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.auto:auto-common:0.8=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.code.findbugs:jsr305:3.0.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.google.code.gson:gson:2.8.5=lintClassPath
+com.google.errorprone:error_prone_annotations:2.2.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
-com.google.guava:failureaccess:1.0.1=lintClassPath
+com.google.guava:failureaccess:1.0.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.guava:guava:27.0.1-jre=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.google.guava:guava:28.1-jre=lintClassPath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.j2objc:j2objc-annotations:1.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.google.j2objc:j2objc-annotations:1.3=lintClassPath
com.google.jimfs:jimfs:1.1=lintClassPath
+com.google.protobuf:protobuf-java:2.6.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.google.protobuf:protobuf-java:3.10.0=lintClassPath
com.googlecode.json-simple:json-simple:1.1=lintClassPath
+com.ibm.icu:icu4j:53.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.squareup:javawriter:2.5.0=lintClassPath
com.sun.activation:javax.activation:1.2.0=lintClassPath
com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
@@ -68,25 +81,51 @@
commons-logging:commons-logging:1.2=lintClassPath
it.unimi.dsi:fastutil:7.2.0=lintClassPath
javax.activation:javax.activation-api:1.2.0=lintClassPath
-javax.inject:javax.inject:1=lintClassPath
+javax.annotation:javax.annotation-api:1.3.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+javax.inject:javax.inject:1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
javax.xml.bind:jaxb-api:2.3.1=lintClassPath
junit:junit:4.12=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.10.15=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-net.bytebuddy:byte-buddy:1.10.15=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+nekohtml:nekohtml:1.9.6.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+nekohtml:xercesMinimal:1.9.6.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.11.13=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+net.bytebuddy:byte-buddy:1.11.13=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
net.sf.kxml:kxml2:2.3.0=lintClassPath
+org.apache.ant:ant-launcher:1.8.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.ant:ant:1.8.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.apache.commons:commons-compress:1.12=lintClassPath
org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
+org.apache.maven.wagon:wagon-file:1.0-beta-6=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven.wagon:wagon-http-shared:1.0-beta-6=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven.wagon:wagon-provider-api:1.0-beta-6=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven:maven-ant-tasks:2.1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven:maven-artifact-manager:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven:maven-artifact:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven:maven-error-diagnostics:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven:maven-model:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven:maven-plugin-registry:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven:maven-profile:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven:maven-project:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven:maven-repository-metadata:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.apache.maven:maven-settings:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
+org.bouncycastle:bcprov-jdk15on:1.52=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
+org.checkerframework:checker-qual:2.5.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.checkerframework:checker-qual:2.8.1=lintClassPath
org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.17=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
+org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.codehaus.plexus:plexus-interpolation:1.11=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.codehaus.plexus:plexus-utils:1.5.15=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
org.glassfish.jaxb:txw2:2.3.1=lintClassPath
org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.hamcrest:hamcrest-library:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
@@ -95,11 +134,23 @@
org.jetbrains.trove4j:trove4j:20160824=lintClassPath
org.jetbrains:annotations:13.0=lintClassPath
org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.mockito:mockito-core:3.5.13=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.objenesis:objenesis:3.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.ow2.asm:asm-commons:7.0=lintClassPath
-org.ow2.asm:asm-tree:7.0=lintClassPath
-org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=lintClassPath
+org.mockito:mockito-core:3.12.4=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.mockito:mockito-inline:3.12.4=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.objenesis:objenesis:3.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.ow2.asm:asm-analysis:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.ow2.asm:asm-commons:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.ow2.asm:asm-tree:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.ow2.asm:asm-util:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.ow2.asm:asm:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.robolectric:annotations:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.robolectric:junit:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.robolectric:pluginapi:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.robolectric:plugins-maven-dependency-resolver:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.robolectric:resources:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.robolectric:robolectric:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.robolectric:sandbox:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.robolectric:shadowapi:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.robolectric:shadows-framework:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.robolectric:utils-reflector:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.robolectric:utils:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
diff --git a/dev/integration_tests/gradle_deprecated_settings/android/project-flutter_plugin_android_lifecycle.lockfile b/dev/integration_tests/gradle_deprecated_settings/android/project-flutter_plugin_android_lifecycle.lockfile
new file mode 100644
index 0000000..6f85c16
--- /dev/null
+++ b/dev/integration_tests/gradle_deprecated_settings/android/project-flutter_plugin_android_lifecycle.lockfile
@@ -0,0 +1,103 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+androidx.activity:activity:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.annotation:annotation:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.arch.core:core-common:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.arch.core:core-runtime:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.collection:collection:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.core:core:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.customview:customview:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.fragment:fragment:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.lifecycle:lifecycle-common-java8:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.lifecycle:lifecycle-common:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.lifecycle:lifecycle-livedata-core:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.lifecycle:lifecycle-livedata:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.lifecycle:lifecycle-runtime:2.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.lifecycle:lifecycle-viewmodel:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
+com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
+com.android.tools.build:apksig:4.1.3=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
+com.google.code.findbugs:jsr305:3.0.2=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
+com.google.guava:failureaccess:1.0.1=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
+com.google.j2objc:j2objc-annotations:1.3=lintClassPath
+com.google.jimfs:jimfs:1.1=lintClassPath
+com.google.protobuf:protobuf-java:3.10.0=lintClassPath
+com.googlecode.json-simple:json-simple:1.1=lintClassPath
+com.squareup:javawriter:2.5.0=lintClassPath
+com.sun.activation:javax.activation:1.2.0=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
+commons-codec:commons-codec:1.10=lintClassPath
+commons-logging:commons-logging:1.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
+javax.inject:javax.inject:1=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
+junit:junit:4.12=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
+net.sf.kxml:kxml2:2.3.0=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
+org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
+org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
+org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
+org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
+org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
+org.jetbrains:annotations:13.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
+org.mockito:mockito-core:1.10.19=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.objenesis:objenesis:2.1=debugUnitTestRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestRuntimeClasspath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
+org.ow2.asm:asm-util:7.0=lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
diff --git a/dev/integration_tests/hybrid_android_views/android/build.gradle b/dev/integration_tests/hybrid_android_views/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/hybrid_android_views/android/build.gradle
+++ b/dev/integration_tests/hybrid_android_views/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/hybrid_android_views/android/buildscript-gradle.lockfile b/dev/integration_tests/hybrid_android_views/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/hybrid_android_views/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/hybrid_android_views/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/non_nullable/android/build.gradle b/dev/integration_tests/non_nullable/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/non_nullable/android/build.gradle
+++ b/dev/integration_tests/non_nullable/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/non_nullable/android/buildscript-gradle.lockfile b/dev/integration_tests/non_nullable/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/non_nullable/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/non_nullable/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/non_nullable/android/project-app.lockfile b/dev/integration_tests/non_nullable/android/project-app.lockfile
index 3c50dcc..a135c00 100644
--- a/dev/integration_tests/non_nullable/android/project-app.lockfile
+++ b/dev/integration_tests/non_nullable/android/project-app.lockfile
@@ -84,19 +84,19 @@
org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
org.glassfish.jaxb:txw2:2.3.1=lintClassPath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.4.32=kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.5.31=kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-script-runtime:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.5.31=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.trove4j:trove4j:20160824=lintClassPath
org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jvnet.staxex:stax-ex:1.8=lintClassPath
@@ -105,4 +105,4 @@
org.ow2.asm:asm-tree:7.0=lintClassPath
org.ow2.asm:asm-util:7.0=lintClassPath
org.ow2.asm:asm:7.0=lintClassPath
-empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
+empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugIntransitiveDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestIntransitiveDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileIntransitiveDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseIntransitiveDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestIntransitiveDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugIntransitiveDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestIntransitiveDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathDebug,kotlinCompilerPluginClasspathDebugAndroidTest,kotlinCompilerPluginClasspathDebugUnitTest,kotlinCompilerPluginClasspathProfile,kotlinCompilerPluginClasspathProfileUnitTest,kotlinCompilerPluginClasspathRelease,kotlinCompilerPluginClasspathReleaseUnitTest,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileIntransitiveDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestIntransitiveDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseIntransitiveDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestIntransitiveDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugIntransitiveDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileIntransitiveDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseIntransitiveDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
diff --git a/dev/integration_tests/platform_interaction/android/build.gradle b/dev/integration_tests/platform_interaction/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/platform_interaction/android/build.gradle
+++ b/dev/integration_tests/platform_interaction/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/platform_interaction/android/buildscript-gradle.lockfile b/dev/integration_tests/platform_interaction/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/platform_interaction/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/platform_interaction/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/release_smoke_test/android/build.gradle b/dev/integration_tests/release_smoke_test/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/release_smoke_test/android/build.gradle
+++ b/dev/integration_tests/release_smoke_test/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/release_smoke_test/android/buildscript-gradle.lockfile b/dev/integration_tests/release_smoke_test/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/release_smoke_test/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/release_smoke_test/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/integration_tests/ui/android/build.gradle b/dev/integration_tests/ui/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/integration_tests/ui/android/build.gradle
+++ b/dev/integration_tests/ui/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/integration_tests/ui/android/buildscript-gradle.lockfile b/dev/integration_tests/ui/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/integration_tests/ui/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/ui/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/manual_tests/android/build.gradle b/dev/manual_tests/android/build.gradle
index c9049d0..71333c7 100644
--- a/dev/manual_tests/android/build.gradle
+++ b/dev/manual_tests/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/dev/manual_tests/android/buildscript-gradle.lockfile b/dev/manual_tests/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/dev/manual_tests/android/buildscript-gradle.lockfile
+++ b/dev/manual_tests/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/dev/manual_tests/android/project-app.lockfile b/dev/manual_tests/android/project-app.lockfile
index 3c50dcc..a135c00 100644
--- a/dev/manual_tests/android/project-app.lockfile
+++ b/dev/manual_tests/android/project-app.lockfile
@@ -84,19 +84,19 @@
org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
org.glassfish.jaxb:txw2:2.3.1=lintClassPath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.4.32=kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.5.31=kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-script-runtime:1.5.31=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.5.31=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.trove4j:trove4j:20160824=lintClassPath
org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jvnet.staxex:stax-ex:1.8=lintClassPath
@@ -105,4 +105,4 @@
org.ow2.asm:asm-tree:7.0=lintClassPath
org.ow2.asm:asm-util:7.0=lintClassPath
org.ow2.asm:asm:7.0=lintClassPath
-empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
+empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugIntransitiveDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestIntransitiveDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileIntransitiveDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseIntransitiveDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestIntransitiveDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugIntransitiveDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestIntransitiveDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathDebug,kotlinCompilerPluginClasspathDebugAndroidTest,kotlinCompilerPluginClasspathDebugUnitTest,kotlinCompilerPluginClasspathProfile,kotlinCompilerPluginClasspathProfileUnitTest,kotlinCompilerPluginClasspathRelease,kotlinCompilerPluginClasspathReleaseUnitTest,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileIntransitiveDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestIntransitiveDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseIntransitiveDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestIntransitiveDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugIntransitiveDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileIntransitiveDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseIntransitiveDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
diff --git a/dev/tools/bin/generate_gradle_lockfiles.dart b/dev/tools/bin/generate_gradle_lockfiles.dart
index c4106ca..3c71dcc 100644
--- a/dev/tools/bin/generate_gradle_lockfiles.dart
+++ b/dev/tools/bin/generate_gradle_lockfiles.dart
@@ -69,6 +69,12 @@
print('Processing ${androidDirectory.path}');
+ try {
+ androidDirectory.childFile('buildscript-gradle.lockfile').deleteSync();
+ } on FileSystemException {
+ // noop
+ }
+
rootBuildGradle.writeAsStringSync(rootGradleFileContent);
settingsGradle.writeAsStringSync(settingGradleFile);
@@ -119,7 +125,7 @@
String? workingDirectory,
}) {
final ProcessResult result = Process.runSync(cmd, args, workingDirectory: workingDirectory);
- if (result.exitCode != 0 || '${result.stderr}'.isNotEmpty)
+ if (result.exitCode != 0)
throw ProcessException(
cmd, args, '${result.stdout}${result.stderr}', result.exitCode);
}
@@ -134,7 +140,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -161,8 +167,9 @@
subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/examples/flutter_view/android/build.gradle b/examples/flutter_view/android/build.gradle
index c9049d0..71333c7 100644
--- a/examples/flutter_view/android/build.gradle
+++ b/examples/flutter_view/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/examples/flutter_view/android/buildscript-gradle.lockfile b/examples/flutter_view/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/examples/flutter_view/android/buildscript-gradle.lockfile
+++ b/examples/flutter_view/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/examples/hello_world/android/build.gradle b/examples/hello_world/android/build.gradle
index c9049d0..71333c7 100644
--- a/examples/hello_world/android/build.gradle
+++ b/examples/hello_world/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/examples/hello_world/android/buildscript-gradle.lockfile b/examples/hello_world/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/examples/hello_world/android/buildscript-gradle.lockfile
+++ b/examples/hello_world/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/examples/image_list/android/build.gradle b/examples/image_list/android/build.gradle
index c9049d0..71333c7 100644
--- a/examples/image_list/android/build.gradle
+++ b/examples/image_list/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/examples/image_list/android/buildscript-gradle.lockfile b/examples/image_list/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/examples/image_list/android/buildscript-gradle.lockfile
+++ b/examples/image_list/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/examples/layers/android/build.gradle b/examples/layers/android/build.gradle
index c9049d0..71333c7 100644
--- a/examples/layers/android/build.gradle
+++ b/examples/layers/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/examples/layers/android/buildscript-gradle.lockfile b/examples/layers/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/examples/layers/android/buildscript-gradle.lockfile
+++ b/examples/layers/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/examples/platform_channel/android/build.gradle b/examples/platform_channel/android/build.gradle
index c9049d0..71333c7 100644
--- a/examples/platform_channel/android/build.gradle
+++ b/examples/platform_channel/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/examples/platform_channel/android/buildscript-gradle.lockfile b/examples/platform_channel/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/examples/platform_channel/android/buildscript-gradle.lockfile
+++ b/examples/platform_channel/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/examples/platform_view/android/build.gradle b/examples/platform_view/android/build.gradle
index c9049d0..71333c7 100644
--- a/examples/platform_view/android/build.gradle
+++ b/examples/platform_view/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/examples/platform_view/android/buildscript-gradle.lockfile b/examples/platform_view/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/examples/platform_view/android/buildscript-gradle.lockfile
+++ b/examples/platform_view/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
diff --git a/packages/flutter_tools/lib/src/android/gradle_errors.dart b/packages/flutter_tools/lib/src/android/gradle_errors.dart
index 3277527..997c715 100644
--- a/packages/flutter_tools/lib/src/android/gradle_errors.dart
+++ b/packages/flutter_tools/lib/src/android/gradle_errors.dart
@@ -75,6 +75,7 @@
transformInputIssue,
lockFileDepMissing,
multidexErrorHandler,
+ incompatibleKotlinVersionHandler,
];
// Multidex error message.
@@ -471,3 +472,32 @@
},
eventLabel: 'lock-dep-issue',
);
+
+@visibleForTesting
+final GradleHandledError incompatibleKotlinVersionHandler = GradleHandledError(
+ test: _lineMatcher(const <String>[
+ 'Module was compiled with an incompatible version of Kotlin',
+ ]),
+ handler: ({
+ required String line,
+ required FlutterProject project,
+ required bool usesAndroidX,
+ required bool multidexEnabled,
+ }) async {
+ final File gradleFile = project.directory
+ .childDirectory('android')
+ .childFile('build.gradle');
+ globals.printStatus(
+ '${globals.logger.terminal.warningMark} Your project requires a newer version of the Kotlin Gradle plugin.',
+ emphasis: true,
+ );
+ globals.printStatus(
+ 'Find the latest version on https://kotlinlang.org/docs/gradle.html#plugin-and-versions, '
+ 'then update ${gradleFile.path}:\n'
+ "ext.kotlin_version = '<latest-version>'",
+ indent: 4,
+ );
+ return GradleBuildStatus.exit;
+ },
+ eventLabel: 'incompatible-kotlin-version',
+);
diff --git a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
index a1ff236..8cb73cd 100644
--- a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
@@ -33,6 +33,7 @@
transformInputIssue,
lockFileDepMissing,
multidexErrorHandler,
+ incompatibleKotlinVersionHandler,
])
);
});
@@ -854,6 +855,35 @@
ProcessManager: () => FakeProcessManager.empty(),
});
});
+
+ group('Incompatible Kotlin version', () {
+ testWithoutContext('pattern', () {
+ expect(
+ incompatibleKotlinVersionHandler.test('Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.5.1, expected version is 1.1.15.'),
+ isTrue,
+ );
+ });
+
+ testUsingContext('suggestion', () async {
+ await incompatibleKotlinVersionHandler.handler(
+ project: FlutterProject.fromDirectoryTest(globals.fs.currentDirectory),
+ );
+
+ expect(
+ testLogger.statusText,
+ contains(
+ '[!] Your project requires a newer version of the Kotlin Gradle plugin.\n'
+ ' Find the latest version on https://kotlinlang.org/docs/gradle.html#plugin-and-versions, then update /android/build.gradle:\n'
+ " ext.kotlin_version = '<latest-version>'\n"
+ )
+ );
+ }, overrides: <Type, Generator>{
+ GradleUtils: () => FakeGradleUtils(),
+ Platform: () => fakePlatform('android'),
+ FileSystem: () => MemoryFileSystem.test(),
+ ProcessManager: () => FakeProcessManager.empty(),
+ });
+ });
}
bool formatTestErrorMessage(String errorMessage, GradleHandledError error) {
diff --git a/packages/integration_test/example/android/build.gradle b/packages/integration_test/example/android/build.gradle
index c9049d0..71333c7 100644
--- a/packages/integration_test/example/android/build.gradle
+++ b/packages/integration_test/example/android/build.gradle
@@ -7,7 +7,7 @@
// See dev/tools/bin/generate_gradle_lockfiles.dart.
buildscript {
- ext.kotlin_version = '1.4.32'
+ ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()
@@ -37,7 +37,6 @@
}
subprojects {
project.evaluationDependsOn(':app')
-
dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
diff --git a/packages/integration_test/example/android/buildscript-gradle.lockfile b/packages/integration_test/example/android/buildscript-gradle.lockfile
index f992a06..2577f0a 100644
--- a/packages/integration_test/example/android/buildscript-gradle.lockfile
+++ b/packages/integration_test/example/android/buildscript-gradle.lockfile
@@ -39,10 +39,10 @@
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.6=classpath
com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.errorprone:error_prone_annotations:2.3.2=classpath
+com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:28.1-jre=classpath
+com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath
@@ -59,7 +59,7 @@
commons-codec:commons-codec:1.10=classpath
commons-io:commons-io:2.4=classpath
commons-logging:commons-logging:1.2=classpath
-de.undercouch:gradle-download-task:4.0.2=classpath
+de.undercouch:gradle-download-task:4.1.1=classpath
it.unimi.dsi:fastutil:7.2.0=classpath
javax.activation:javax.activation-api:1.2.0=classpath
javax.inject:javax.inject:1=classpath
@@ -68,7 +68,6 @@
net.sf.kxml:kxml2:2.3.0=classpath
net.sf.proguard:proguard-base:6.0.3=classpath
net.sf.proguard:proguard-gradle:6.0.3=classpath
-org.antlr:antlr4-runtime:4.5.2-1=classpath
org.antlr:antlr4:4.5.3=classpath
org.apache.commons:commons-compress:1.12=classpath
org.apache.httpcomponents:httpclient:4.5.6=classpath
@@ -76,35 +75,38 @@
org.apache.httpcomponents:httpmime:4.5.6=classpath
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
+org.checkerframework:checker-qual:2.11.1=classpath
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
org.glassfish.jaxb:txw2:2.3.1=classpath
org.jdom:jdom2:2.0.6=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-build-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
org.jetbrains.trove4j:trove4j:20160824=classpath
org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath
