From b586695c8244816367a21915f5680dbab3114464 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Mon, 16 Aug 2021 18:40:39 -0700 Subject: [PATCH] Reland: Bump to Gradle 7 and use Open JDK 11 (#88319) * Bump to Gradle 7 and use Open JDK 11 * Add caches * Fixes * Remove org.gradle.java.home --- .ci.yaml | 36 ++++ .../complex_layout/android/app/build.gradle | 4 +- .../complex_layout/android/build.gradle | 2 +- .../android/buildscript-gradle.lockfile | 125 ++++++++------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/project-app.lockfile | 160 ++++++++++++------ .../android/project-integration_test.lockfile | 160 ++++++++++++------ .../android/buildscript-gradle.lockfile | 118 ------------- 8 files changed, 323 insertions(+), 284 deletions(-) delete mode 100644 packages/integration_test/android/buildscript-gradle.lockfile diff --git a/.ci.yaml b/.ci.yaml index 59b42e76308..b8115eb66ac 100755 --- a/.ci.yaml +++ b/.ci.yaml @@ -1265,41 +1265,77 @@ targets: - name: Linux_android complex_layout_android__compile recipe: devicelab/devicelab_drone presubmit: false + bringup: true timeout: 60 properties: tags: > ["devicelab","android","linux"] task_name: complex_layout_android__compile + dependencies: >- + [ + {"dependency": "open_jdk", "version": "11"} + ] + caches: >- + [ + {"name": "openjdk", "path": "java11"} + ] scheduler: luci - name: Linux_android complex_layout_android__scroll_smoothness recipe: devicelab/devicelab_drone presubmit: false + bringup: true timeout: 60 properties: tags: > ["devicelab","android","linux"] task_name: complex_layout_android__scroll_smoothness + dependencies: >- + [ + {"dependency": "open_jdk", "version": "11"} + ] + caches: >- + [ + {"name": "openjdk", "path": "java11"} + ] scheduler: luci - name: Linux_android complex_layout_scroll_perf__devtools_memory recipe: devicelab/devicelab_drone presubmit: false + bringup: true timeout: 60 properties: tags: > ["devicelab","android","linux"] task_name: complex_layout_scroll_perf__devtools_memory + dependencies: >- + [ + {"dependency": "open_jdk", "version": "11"} + ] + caches: >- + [ + {"name": "openjdk", "path": "java11"} + ] scheduler: luci - name: Linux_android complex_layout_semantics_perf recipe: devicelab/devicelab_drone presubmit: false + bringup: true timeout: 60 properties: tags: > ["devicelab","android","linux"] task_name: complex_layout_semantics_perf + dependencies: >- + [ + {"dependency": "open_jdk", "version": "11"} + ] + caches: >- + [ + {"name": "openjdk", "path": "java11"} + ] scheduler: luci - name: Linux_android cubic_bezier_perf__e2e_summary diff --git a/dev/benchmarks/complex_layout/android/app/build.gradle b/dev/benchmarks/complex_layout/android/app/build.gradle index f65b47e31fd..ae4ff7be2fa 100644 --- a/dev/benchmarks/complex_layout/android/app/build.gradle +++ b/dev/benchmarks/complex_layout/android/app/build.gradle @@ -22,8 +22,8 @@ android { compileSdkVersion 30 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } defaultConfig { diff --git a/dev/benchmarks/complex_layout/android/build.gradle b/dev/benchmarks/complex_layout/android/build.gradle index f7ec09745ff..6b39839df69 100644 --- a/dev/benchmarks/complex_layout/android/build.gradle +++ b/dev/benchmarks/complex_layout/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:7.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile b/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile index f992a060f2e..969a5decf60 100644 --- a/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile +++ b/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile @@ -1,85 +1,109 @@ # 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.databinding:databinding-common:4.1.3=classpath -androidx.databinding:databinding-compiler-common:4.1.3=classpath -com.android.databinding:baseLibrary:4.1.3=classpath -com.android.tools.analytics-library:crash:27.1.3=classpath -com.android.tools.analytics-library:protos:27.1.3=classpath -com.android.tools.analytics-library:shared:27.1.3=classpath -com.android.tools.analytics-library:tracker:27.1.3=classpath +androidx.databinding:databinding-common:7.0.0=classpath +androidx.databinding:databinding-compiler-common:7.0.0=classpath +com.android.databinding:baseLibrary:7.0.0=classpath +com.android.tools.analytics-library:crash:30.0.0=classpath +com.android.tools.analytics-library:protos:30.0.0=classpath +com.android.tools.analytics-library:shared:30.0.0=classpath +com.android.tools.analytics-library:tracker:30.0.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath -com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath -com.android.tools.build:aaptcompiler:4.1.3=classpath -com.android.tools.build:apksig:4.1.3=classpath -com.android.tools.build:apkzlib:4.1.3=classpath -com.android.tools.build:builder-model:4.1.3=classpath -com.android.tools.build:builder-test-api:4.1.3=classpath -com.android.tools.build:builder:4.1.3=classpath -com.android.tools.build:bundletool:0.14.0=classpath -com.android.tools.build:gradle-api:4.1.3=classpath -com.android.tools.build:gradle:4.1.3=classpath -com.android.tools.build:manifest-merger:27.1.3=classpath +com.android.tools.build:aapt2-proto:7.0.0-7396180=classpath +com.android.tools.build:aaptcompiler:7.0.0=classpath +com.android.tools.build:apksig:7.0.0=classpath +com.android.tools.build:apkzlib:7.0.0=classpath +com.android.tools.build:builder-model:7.0.0=classpath +com.android.tools.build:builder-test-api:7.0.0=classpath +com.android.tools.build:builder:7.0.0=classpath +com.android.tools.build:bundletool:1.6.0=classpath +com.android.tools.build:gradle-api:7.0.0=classpath +com.android.tools.build:gradle:7.0.0=classpath +com.android.tools.build:manifest-merger:30.0.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:27.1.3=classpath -com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath -com.android.tools.lint:lint-gradle-api:27.1.3=classpath -com.android.tools.lint:lint-model:27.1.3=classpath -com.android.tools:annotations:27.1.3=classpath -com.android.tools:common:27.1.3=classpath -com.android.tools:dvlib:27.1.3=classpath -com.android.tools:repository:27.1.3=classpath -com.android.tools:sdk-common:27.1.3=classpath -com.android.tools:sdklib:27.1.3=classpath -com.android:signflinger:4.1.3=classpath -com.android:zipflinger:4.1.3=classpath +com.android.tools.ddms:ddmlib:30.0.0=classpath +com.android.tools.layoutlib:layoutlib-api:30.0.0=classpath +com.android.tools.lint:lint-model:30.0.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:30.0.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.0=classpath +com.android.tools:annotations:30.0.0=classpath +com.android.tools:common:30.0.0=classpath +com.android.tools:dvlib:30.0.0=classpath +com.android.tools:repository:30.0.0=classpath +com.android.tools:sdk-common:30.0.0=classpath +com.android.tools:sdklib:30.0.0=classpath +com.android:signflinger:7.0.0=classpath +com.android:zipflinger:7.0.0=classpath com.github.gundy:semver4j:0.16.4=classpath +com.google.android:annotations:4.1.1.4=classpath +com.google.api.grpc:proto-google-common-protos:1.12.0=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath 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.dagger:dagger:2.28.3=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:30.1-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 com.google.protobuf:protobuf-java-util:3.10.0=classpath com.google.protobuf:protobuf-java:3.10.0=classpath -com.google.test.platform:core-proto:0.0.2-dev=classpath +com.google.testing.platform:core-proto:0.0.8-alpha04=classpath com.googlecode.json-simple:json-simple:1.1=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath com.sun.activation:javax.activation:1.2.0=classpath -com.sun.istack:istack-commons-runtime:3.0.7=classpath -com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath +com.sun.istack:istack-commons-runtime:3.0.8=classpath +com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath 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 -it.unimi.dsi:fastutil:7.2.0=classpath -javax.activation:javax.activation-api:1.2.0=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 +io.grpc:grpc-netty:1.21.1=classpath +io.grpc:grpc-protobuf-lite:1.21.1=classpath +io.grpc:grpc-protobuf:1.21.1=classpath +io.grpc:grpc-stub:1.21.1=classpath +io.netty:netty-buffer:4.1.34.Final=classpath +io.netty:netty-codec-http2:4.1.34.Final=classpath +io.netty:netty-codec-http:4.1.34.Final=classpath +io.netty:netty-codec-socks:4.1.34.Final=classpath +io.netty:netty-codec:4.1.34.Final=classpath +io.netty:netty-common:4.1.34.Final=classpath +io.netty:netty-handler-proxy:4.1.34.Final=classpath +io.netty:netty-handler:4.1.34.Final=classpath +io.netty:netty-resolver:4.1.34.Final=classpath +io.netty:netty-transport:4.1.34.Final=classpath +io.opencensus:opencensus-api:0.21.0=classpath +io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath +it.unimi.dsi:fastutil:8.4.0=classpath +jakarta.activation:jakarta.activation-api:1.2.1=classpath +jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.inject:javax.inject:1=classpath -javax.xml.bind:jaxb-api:2.3.1=classpath +net.java.dev.jna:jna-platform:5.6.0=classpath +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 -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.commons:commons-compress:1.20=classpath org.apache.httpcomponents:httpclient:4.5.6=classpath org.apache.httpcomponents:httpcore:4.4.10=classpath 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.glassfish.jaxb:jaxb-runtime:2.3.1=classpath -org.glassfish.jaxb:txw2:2.3.1=classpath +org.checkerframework:checker-qual:3.5.0=classpath +org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath +org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath +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 @@ -99,20 +123,21 @@ 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-stdlib-jdk7:1.3.72=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=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.trove4j:trove4j:20160824=classpath org.jetbrains:annotations:13.0=classpath org.json:json:20180813=classpath -org.jvnet.staxex:stax-ex:1.8=classpath +org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:7.0=classpath org.ow2.asm:asm-commons:7.0=classpath org.ow2.asm:asm-tree:7.0=classpath org.ow2.asm:asm-util:7.0=classpath org.ow2.asm:asm:7.0=classpath -org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath +org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath +xerces:xercesImpl:2.12.0=classpath +xml-apis:xml-apis:1.4.01=classpath empty= diff --git a/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties b/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties index bc6a58afdda..b8793d3c0d6 100644 --- a/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/dev/benchmarks/complex_layout/android/project-app.lockfile b/dev/benchmarks/complex_layout/android/project-app.lockfile index cf6325c728d..eab1d1bea61 100644 --- a/dev/benchmarks/complex_layout/android/project-app.lockfile +++ b/dev/benchmarks/complex_layout/android/project-app.lockfile @@ -24,44 +24,45 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,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.analytics-library:protos:30.0.0=lintClassPath +com.android.tools.analytics-library:shared:30.0.0=lintClassPath +com.android.tools.analytics-library:tracker:30.0.0=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.android.tools.build:apksig:7.0.0=lintClassPath +com.android.tools.build:apkzlib:7.0.0=lintClassPath +com.android.tools.build:builder-model:7.0.0=lintClassPath +com.android.tools.build:builder-test-api:7.0.0=lintClassPath +com.android.tools.build:builder:7.0.0=lintClassPath +com.android.tools.build:manifest-merger:30.0.0=lintClassPath +com.android.tools.ddms:ddmlib:30.0.0=lintClassPath +com.android.tools.external.com-intellij:intellij-core:30.0.0=lintClassPath +com.android.tools.external.com-intellij:kotlin-compiler:30.0.0=lintClassPath +com.android.tools.external.org-jetbrains:uast:30.0.0=lintClassPath +com.android.tools.layoutlib:layoutlib-api:30.0.0=lintClassPath +com.android.tools.lint:lint-api:30.0.0=lintClassPath +com.android.tools.lint:lint-checks:30.0.0=lintClassPath +com.android.tools.lint:lint-gradle:30.0.0=lintClassPath +com.android.tools.lint:lint-model:30.0.0=lintClassPath +com.android.tools.lint:lint:30.0.0=lintClassPath +com.android.tools:annotations:30.0.0=lintClassPath +com.android.tools:common:30.0.0=lintClassPath +com.android.tools:dvlib:30.0.0=lintClassPath +com.android.tools:repository:30.0.0=lintClassPath +com.android.tools:sdk-common:30.0.0=lintClassPath +com.android.tools:sdklib:30.0.0=lintClassPath +com.android:signflinger:7.0.0=lintClassPath +com.android:zipflinger:7.0.0=lintClassPath +com.beust:jcommander:1.78=lintClassPath +com.github.javaparser:javaparser-core:3.17.0=lintClassPath com.google.code.findbugs:jsr305:2.0.1=debugAndroidTestCompileClasspath com.google.code.findbugs:jsr305:3.0.2=debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -com.google.code.gson:gson:2.8.5=lintClassPath -com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath +com.google.code.gson:gson:2.8.6=lintClassPath +com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath com.google.guava:failureaccess:1.0.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath com.google.guava:guava:28.1-android=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath -com.google.guava:guava:28.1-jre=lintClassPath +com.google.guava:guava:30.1-jre=lintClassPath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath com.google.j2objc:j2objc-annotations:1.3=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath com.google.jimfs:jimfs:1.1=lintClassPath @@ -70,43 +71,90 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,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 -com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath +com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath +com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath +com.thoughtworks.qdox:qdox:1.12.1=lintClassPath commons-codec:commons-codec:1.10=lintClassPath +commons-io:commons-io:2.4=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 +info.picocli:picocli:4.5.2=lintClassPath +it.unimi.dsi:fastutil:8.4.0=lintClassPath +jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath +jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -javax.xml.bind:jaxb-api:2.3.1=lintClassPath +jline:jline:2.14.6=lintClassPath junit:junit:4.12=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +junit:junit:4.13.1=lintClassPath +net.java.dev.jna:jna-platform:5.6.0=lintClassPath +net.java.dev.jna:jna:5.6.0=lintClassPath net.sf.jopt-simple:jopt-simple:4.9=lintClassPath net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.apache.commons:commons-compress:1.12=lintClassPath +org.apache.ant:ant-antlr:1.10.9=lintClassPath +org.apache.ant:ant-junit:1.10.9=lintClassPath +org.apache.ant:ant-launcher:1.10.9=lintClassPath +org.apache.ant:ant:1.10.9=lintClassPath +org.apache.commons:commons-compress:1.20=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-compat-qual:2.5.5=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,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.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath -org.glassfish.jaxb:txw2:2.3.1=lintClassPath -org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.checkerframework:checker-qual:3.5.0=lintClassPath +org.codehaus.groovy:groovy-all:3.0.7=lintClassPath +org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath +org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath +org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath +org.codehaus.groovy:groovy-console:3.0.7=lintClassPath +org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath +org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath +org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath +org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath +org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath +org.codehaus.groovy:groovy-json:3.0.7=lintClassPath +org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath +org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath +org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath +org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath +org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath +org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath +org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath +org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath +org.codehaus.groovy:groovy-test:3.0.7=lintClassPath +org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath +org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath +org.codehaus.groovy:groovy:3.0.7=lintClassPath +org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath +org.glassfish.jaxb:txw2:2.3.2=lintClassPath +org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,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.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt +org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt +org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt +org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt +org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath +org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath org.jetbrains:annotations:13.0=lintClassPath -org.jvnet.staxex:stax-ex:1.8=lintClassPath -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.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath +org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath +org.junit.platform:junit-platform-commons:1.7.0=lintClassPath +org.junit.platform:junit-platform-engine:1.7.0=lintClassPath +org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath +org.junit:junit-bom:5.7.0=lintClassPath +org.jvnet.staxex:stax-ex:1.8.1=lintClassPath +org.opentest4j:opentest4j:1.2.0=lintClassPath +org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath +org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath +org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath org.ow2.asm:asm-util:7.0=lintClassPath -org.ow2.asm:asm:7.0=lintClassPath -empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile +org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath +org.testng:testng:7.3.0=lintClassPath +xerces:xercesImpl:2.12.0=lintClassPath +xml-apis:xml-apis:1.4.01=lintClassPath +empty=androidApis,androidJdkImage,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile diff --git a/dev/benchmarks/complex_layout/android/project-integration_test.lockfile b/dev/benchmarks/complex_layout/android/project-integration_test.lockfile index 3587433afdc..105b33ceb64 100644 --- a/dev/benchmarks/complex_layout/android/project-integration_test.lockfile +++ b/dev/benchmarks/complex_layout/android/project-integration_test.lockfile @@ -24,43 +24,44 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRunti androidx.test:runner:1.2.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.analytics-library:protos:30.0.0=lintClassPath +com.android.tools.analytics-library:shared:30.0.0=lintClassPath +com.android.tools.analytics-library:tracker:30.0.0=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.android.tools.build:apksig:7.0.0=lintClassPath +com.android.tools.build:apkzlib:7.0.0=lintClassPath +com.android.tools.build:builder-model:7.0.0=lintClassPath +com.android.tools.build:builder-test-api:7.0.0=lintClassPath +com.android.tools.build:builder:7.0.0=lintClassPath +com.android.tools.build:manifest-merger:30.0.0=lintClassPath +com.android.tools.ddms:ddmlib:30.0.0=lintClassPath +com.android.tools.external.com-intellij:intellij-core:30.0.0=lintClassPath +com.android.tools.external.com-intellij:kotlin-compiler:30.0.0=lintClassPath +com.android.tools.external.org-jetbrains:uast:30.0.0=lintClassPath +com.android.tools.layoutlib:layoutlib-api:30.0.0=lintClassPath +com.android.tools.lint:lint-api:30.0.0=lintClassPath +com.android.tools.lint:lint-checks:30.0.0=lintClassPath +com.android.tools.lint:lint-gradle:30.0.0=lintClassPath +com.android.tools.lint:lint-model:30.0.0=lintClassPath +com.android.tools.lint:lint:30.0.0=lintClassPath +com.android.tools:annotations:30.0.0=lintClassPath +com.android.tools:common:30.0.0=lintClassPath +com.android.tools:dvlib:30.0.0=lintClassPath +com.android.tools:repository:30.0.0=lintClassPath +com.android.tools:sdk-common:30.0.0=lintClassPath +com.android.tools:sdklib:30.0.0=lintClassPath +com.android:signflinger:7.0.0=lintClassPath +com.android:zipflinger:7.0.0=lintClassPath +com.beust:jcommander:1.78=lintClassPath +com.github.javaparser:javaparser-core:3.17.0=lintClassPath com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -com.google.code.gson:gson:2.8.5=lintClassPath -com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.google.code.gson:gson:2.8.6=lintClassPath +com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath com.google.guava:failureaccess:1.0.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath com.google.guava:guava:28.1-android=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -com.google.guava:guava:28.1-jre=lintClassPath +com.google.guava:guava:30.1-jre=lintClassPath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath com.google.j2objc:j2objc-annotations:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath com.google.jimfs:jimfs:1.1=lintClassPath @@ -69,43 +70,90 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,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 -com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath +com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath +com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath +com.thoughtworks.qdox:qdox:1.12.1=lintClassPath commons-codec:commons-codec:1.10=lintClassPath +commons-io:commons-io:2.4=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 +info.picocli:picocli:4.5.2=lintClassPath +it.unimi.dsi:fastutil:8.4.0=lintClassPath +jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath +jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -javax.xml.bind:jaxb-api:2.3.1=lintClassPath +jline:jline:2.14.6=lintClassPath junit:junit:4.12=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +junit:junit:4.13.1=lintClassPath +net.java.dev.jna:jna-platform:5.6.0=lintClassPath +net.java.dev.jna:jna:5.6.0=lintClassPath net.sf.jopt-simple:jopt-simple:4.9=lintClassPath net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.apache.commons:commons-compress:1.12=lintClassPath +org.apache.ant:ant-antlr:1.10.9=lintClassPath +org.apache.ant:ant-junit:1.10.9=lintClassPath +org.apache.ant:ant-launcher:1.10.9=lintClassPath +org.apache.ant:ant:1.10.9=lintClassPath +org.apache.commons:commons-compress:1.20=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-compat-qual:2.5.5=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,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.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,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=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.checkerframework:checker-qual:3.5.0=lintClassPath +org.codehaus.groovy:groovy-all:3.0.7=lintClassPath +org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath +org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath +org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath +org.codehaus.groovy:groovy-console:3.0.7=lintClassPath +org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath +org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath +org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath +org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath +org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath +org.codehaus.groovy:groovy-json:3.0.7=lintClassPath +org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath +org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath +org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath +org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath +org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath +org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath +org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath +org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath +org.codehaus.groovy:groovy-test:3.0.7=lintClassPath +org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath +org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath +org.codehaus.groovy:groovy:3.0.7=lintClassPath +org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath +org.glassfish.jaxb:txw2:2.3.2=lintClassPath +org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,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.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt +org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt +org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt +org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt +org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath +org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath +org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath org.jetbrains:annotations:13.0=lintClassPath -org.jvnet.staxex:stax-ex:1.8=lintClassPath -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.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath +org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath +org.junit.platform:junit-platform-commons:1.7.0=lintClassPath +org.junit.platform:junit-platform-engine:1.7.0=lintClassPath +org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath +org.junit:junit-bom:5.7.0=lintClassPath +org.jvnet.staxex:stax-ex:1.8.1=lintClassPath +org.opentest4j:opentest4j:1.2.0=lintClassPath +org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath +org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath +org.ow2.asm:asm-tree:7.0=androidJacocoAnt,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 +org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath +org.testng:testng:7.3.0=lintClassPath +xerces:xercesImpl:2.12.0=lintClassPath +xml-apis:xml-apis:1.4.01=lintClassPath +empty=androidApis,androidJdkImage,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile diff --git a/packages/integration_test/android/buildscript-gradle.lockfile b/packages/integration_test/android/buildscript-gradle.lockfile deleted file mode 100644 index f992a060f2e..00000000000 --- a/packages/integration_test/android/buildscript-gradle.lockfile +++ /dev/null @@ -1,118 +0,0 @@ -# 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.databinding:databinding-common:4.1.3=classpath -androidx.databinding:databinding-compiler-common:4.1.3=classpath -com.android.databinding:baseLibrary:4.1.3=classpath -com.android.tools.analytics-library:crash:27.1.3=classpath -com.android.tools.analytics-library:protos:27.1.3=classpath -com.android.tools.analytics-library:shared:27.1.3=classpath -com.android.tools.analytics-library:tracker:27.1.3=classpath -com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath -com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath -com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath -com.android.tools.build:aaptcompiler:4.1.3=classpath -com.android.tools.build:apksig:4.1.3=classpath -com.android.tools.build:apkzlib:4.1.3=classpath -com.android.tools.build:builder-model:4.1.3=classpath -com.android.tools.build:builder-test-api:4.1.3=classpath -com.android.tools.build:builder:4.1.3=classpath -com.android.tools.build:bundletool:0.14.0=classpath -com.android.tools.build:gradle-api:4.1.3=classpath -com.android.tools.build:gradle:4.1.3=classpath -com.android.tools.build:manifest-merger:27.1.3=classpath -com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:27.1.3=classpath -com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath -com.android.tools.lint:lint-gradle-api:27.1.3=classpath -com.android.tools.lint:lint-model:27.1.3=classpath -com.android.tools:annotations:27.1.3=classpath -com.android.tools:common:27.1.3=classpath -com.android.tools:dvlib:27.1.3=classpath -com.android.tools:repository:27.1.3=classpath -com.android.tools:sdk-common:27.1.3=classpath -com.android.tools:sdklib:27.1.3=classpath -com.android:signflinger:4.1.3=classpath -com.android:zipflinger:4.1.3=classpath -com.github.gundy:semver4j:0.16.4=classpath -com.google.auto.value:auto-value-annotations:1.6.2=classpath -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.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: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 -com.google.protobuf:protobuf-java-util:3.10.0=classpath -com.google.protobuf:protobuf-java:3.10.0=classpath -com.google.test.platform:core-proto:0.0.2-dev=classpath -com.googlecode.json-simple:json-simple:1.1=classpath -com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath -com.squareup:javapoet:1.10.0=classpath -com.squareup:javawriter:2.5.0=classpath -com.sun.activation:javax.activation:1.2.0=classpath -com.sun.istack:istack-commons-runtime:3.0.7=classpath -com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath -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 -it.unimi.dsi:fastutil:7.2.0=classpath -javax.activation:javax.activation-api:1.2.0=classpath -javax.inject:javax.inject:1=classpath -javax.xml.bind:jaxb-api:2.3.1=classpath -net.sf.jopt-simple:jopt-simple:4.9=classpath -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 -org.apache.httpcomponents:httpcore:4.4.10=classpath -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.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-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.trove4j:trove4j:20160824=classpath -org.jetbrains:annotations:13.0=classpath -org.json:json:20180813=classpath -org.jvnet.staxex:stax-ex:1.8=classpath -org.ow2.asm:asm-analysis:7.0=classpath -org.ow2.asm:asm-commons:7.0=classpath -org.ow2.asm:asm-tree:7.0=classpath -org.ow2.asm:asm-util:7.0=classpath -org.ow2.asm:asm:7.0=classpath -org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath -empty=