diff --git a/DEPS b/DEPS index b3ad1d5de16dc..dbb3ec76bdd0a 100644 --- a/DEPS +++ b/DEPS @@ -101,7 +101,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '97a255eb289ca5b6e03a6c93e2182cdcffce0b76', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '1ba15ce9a85debe5f4efc21699a9f760af165a64', # Fuchsia compatibility # @@ -474,7 +474,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/build-tools/${{platform}}', - 'version': 'version:30.0.2' + 'version': 'version:31.0.0S' } ], 'condition': 'download_android_deps', @@ -485,7 +485,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/platform-tools/${{platform}}', - 'version': 'version:30.0.4' + 'version': 'version:31.0.2S' } ], 'condition': 'download_android_deps', @@ -496,7 +496,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/platforms', - 'version': 'version:30r3' + 'version': 'version:31S' } ], 'condition': 'download_android_deps', diff --git a/shell/platform/android/AndroidManifest.xml b/shell/platform/android/AndroidManifest.xml index 7e10898269888..5fbd0d8553c2b 100644 --- a/shell/platform/android/AndroidManifest.xml +++ b/shell/platform/android/AndroidManifest.xml @@ -5,7 +5,7 @@ --> - + @@ -16,7 +16,8 @@ android:launchMode="standard" android:name="FlutterActivity" android:theme="@android:style/Theme.Black.NoTitleBar" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true"> diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterView.java b/shell/platform/android/io/flutter/embedding/android/FlutterView.java index 06002f5958138..a224d34b26b10 100644 --- a/shell/platform/android/io/flutter/embedding/android/FlutterView.java +++ b/shell/platform/android/io/flutter/embedding/android/FlutterView.java @@ -845,7 +845,7 @@ public AccessibilityNodeProvider getAccessibilityNodeProvider() { * @param accessibilityId The view accessibility id. * @return The view matching the accessibility id if any. */ - @SuppressLint("PrivateApi") + @SuppressLint("SoonBlockedPrivateApi") public View findViewByAccessibilityIdTraversal(int accessibilityId) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { return findViewByAccessibilityIdRootedAtCurrentView(accessibilityId, this); diff --git a/testing/android_background_image/android/app/build.gradle b/testing/android_background_image/android/app/build.gradle index a14505436f3df..362f23c0563b8 100644 --- a/testing/android_background_image/android/app/build.gradle +++ b/testing/android_background_image/android/app/build.gradle @@ -13,15 +13,16 @@ android { // The others are irrelevant for a test application. disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable' } - compileSdkVersion 30 + buildToolsVersion = '31.0.0' + compileSdkVersion 31 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } defaultConfig { applicationId 'dev.flutter.android_background_image' minSdkVersion 16 - targetSdkVersion 30 + targetSdkVersion 31 versionCode 1 versionName '1.0' } diff --git a/testing/android_background_image/android/app/src/main/AndroidManifest.xml b/testing/android_background_image/android/app/src/main/AndroidManifest.xml index dd5e4aae259cc..d55247e606a67 100644 --- a/testing/android_background_image/android/app/src/main/AndroidManifest.xml +++ b/testing/android_background_image/android/app/src/main/AndroidManifest.xml @@ -12,7 +12,8 @@ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:launchMode="singleTop" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true"> diff --git a/testing/android_background_image/android/build.gradle b/testing/android_background_image/android/build.gradle index b6931a6ee732f..bfe1241ab2439 100644 --- a/testing/android_background_image/android/build.gradle +++ b/testing/android_background_image/android/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0' + classpath 'com.android.tools.build:gradle:7.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/testing/android_background_image/android/gradle/wrapper/gradle-wrapper.properties b/testing/android_background_image/android/gradle/wrapper/gradle-wrapper.properties index 56db662b86061..9178380026591 100644 --- a/testing/android_background_image/android/gradle/wrapper/gradle-wrapper.properties +++ b/testing/android_background_image/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.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/testing/run_tests.py b/testing/run_tests.py index eefdaee9220c4..9224aace01459 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -344,7 +344,7 @@ def RunJavaTests(filter, android_variant='android_debug_unopt'): embedding_deps_dir = os.path.join(buildroot_dir, 'third_party', 'android_embedding_dependencies', 'lib') classpath = list(map(str, [ - os.path.join(buildroot_dir, 'third_party', 'android_tools', 'sdk', 'platforms', 'android-30', 'android.jar'), + os.path.join(buildroot_dir, 'third_party', 'android_tools', 'sdk', 'platforms', 'android-31', 'android.jar'), os.path.join(embedding_deps_dir, '*'), # Wildcard for all jars in the directory os.path.join(android_out_dir, 'flutter.jar'), os.path.join(android_out_dir, 'robolectric_tests.jar') diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle index 20185a67135d6..b7b345ac75a72 100644 --- a/testing/scenario_app/android/app/build.gradle +++ b/testing/scenario_app/android/app/build.gradle @@ -24,15 +24,16 @@ android { // The others are irrelevant for a test application. disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered' } - compileSdkVersion 30 + buildToolsVersion = '31.0.0' + compileSdkVersion 31 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } defaultConfig { applicationId 'dev.flutter.scenarios' minSdkVersion 18 - targetSdkVersion 30 + targetSdkVersion 31 versionCode 1 versionName '1.0' testInstrumentationRunner 'dev.flutter.TestRunner' diff --git a/testing/scenario_app/android/app/gradle.lockfile b/testing/scenario_app/android/app/gradle.lockfile new file mode 100644 index 0000000000000..5eab5e9bfd304 --- /dev/null +++ b/testing/scenario_app/android/app/gradle.lockfile @@ -0,0 +1,200 @@ +# 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,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.annotation:annotation:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.appcompat:appcompat-resources:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.appcompat:appcompat:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.arch.core:core-common:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.arch.core:core-runtime:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.asynclayoutinflater:asynclayoutinflater:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.cardview:cardview:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.collection:collection:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.constraintlayout:constraintlayout-solver:1.1.3=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.constraintlayout:constraintlayout:1.1.3=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.coordinatorlayout:coordinatorlayout:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.core:core:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.cursoradapter:cursoradapter:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.customview:customview:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.documentfile:documentfile:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.drawerlayout:drawerlayout:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.fragment:fragment:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.interpolator:interpolator:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.legacy:legacy-support-core-ui:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.legacy:legacy-support-core-utils:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.lifecycle:lifecycle-common:2.2.0-alpha01=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.lifecycle:lifecycle-livedata-core:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.lifecycle:lifecycle-livedata:2.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.lifecycle:lifecycle-runtime:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.lifecycle:lifecycle-viewmodel:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.localbroadcastmanager:localbroadcastmanager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.print:print:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.recyclerview:recyclerview:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.slidingpanelayout:slidingpanelayout:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.swiperefreshlayout:swiperefreshlayout:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.test.espresso:espresso-core:3.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath +androidx.test.espresso:espresso-idling-resource:3.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath +androidx.test:monitor:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath +androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath +androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath +androidx.transition:transition:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.vectordrawable:vectordrawable-animated:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.vectordrawable:vectordrawable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +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: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.facebook.testing.screenshot:core:0.12.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.facebook.testing.screenshot:layout-hierarchy-common:0.12.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.github.javaparser:javaparser-core:3.17.0=lintClassPath +com.google.android.material:material:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.google.code.gson:gson:2.8.6=lintClassPath +com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath +com.google.guava:failureaccess:1.0.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.google.guava:guava:28.1-android=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.google.guava:guava:30.1-jre=lintClassPath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.3=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +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.curtains:curtains:1.0.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:leakcanary-android-core:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:leakcanary-android-instrumentation:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath +com.squareup.leakcanary:leakcanary-android-utils:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:leakcanary-android:2.7=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:leakcanary-object-watcher-android-androidx:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:leakcanary-object-watcher-android:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:leakcanary-object-watcher:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:plumber-android:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:shark-android:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:shark-graph:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:shark-hprof:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:shark-log:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.leakcanary:shark:2.7=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.squareup.okio:okio:2.2.2=debugAndroidTestRuntimeClasspath,debugRuntimeClasspath,debugUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath +com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath +com.squareup:javawriter:2.5.0=lintClassPath +com.sun.activation:javax.activation:1.2.0=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 +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,lintClassPath +jline:jline:2.14.6=lintClassPath +junit:junit:4.12=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,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,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,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,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,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,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,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath +org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath +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.21=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +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.21=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath +org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +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=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,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/androidApis.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/androidApis.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/androidApis.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/androidTestUtil.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/androidTestUtil.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/androidTestUtil.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/compile.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/compile.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/compile.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/coreLibraryDesugaring.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/coreLibraryDesugaring.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/coreLibraryDesugaring.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/debugAndroidTestAnnotationProcessorClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/debugAndroidTestAnnotationProcessorClasspath.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/debugAndroidTestAnnotationProcessorClasspath.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/debugAndroidTestCompileClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/debugAndroidTestCompileClasspath.lockfile deleted file mode 100644 index 3986e7fa2c5a6..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/debugAndroidTestCompileClasspath.lockfile +++ /dev/null @@ -1,83 +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.activity:activity:1.0.0 -androidx.annotation:annotation:1.1.0 -androidx.appcompat:appcompat-resources:1.1.0 -androidx.appcompat:appcompat:1.1.0 -androidx.arch.core:core-common:2.1.0 -androidx.arch.core:core-runtime:2.0.0 -androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 -androidx.cardview:cardview:1.0.0 -androidx.collection:collection:1.1.0 -androidx.constraintlayout:constraintlayout-solver:1.1.3 -androidx.constraintlayout:constraintlayout:1.1.3 -androidx.coordinatorlayout:coordinatorlayout:1.0.0 -androidx.core:core:1.1.0 -androidx.cursoradapter:cursoradapter:1.0.0 -androidx.customview:customview:1.0.0 -androidx.documentfile:documentfile:1.0.0 -androidx.drawerlayout:drawerlayout:1.0.0 -androidx.fragment:fragment:1.1.0 -androidx.interpolator:interpolator:1.0.0 -androidx.legacy:legacy-support-core-ui:1.0.0 -androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01 -androidx.lifecycle:lifecycle-common:2.2.0-alpha01 -androidx.lifecycle:lifecycle-livedata-core:2.0.0 -androidx.lifecycle:lifecycle-livedata:2.0.0 -androidx.lifecycle:lifecycle-runtime:2.1.0 -androidx.lifecycle:lifecycle-viewmodel:2.1.0 -androidx.loader:loader:1.0.0 -androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -androidx.print:print:1.0.0 -androidx.recyclerview:recyclerview:1.0.0 -androidx.savedstate:savedstate:1.0.0 -androidx.slidingpanelayout:slidingpanelayout:1.0.0 -androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -androidx.test.espresso:espresso-core:3.2.0 -androidx.test.espresso:espresso-idling-resource:3.2.0 -androidx.test:monitor:1.2.0 -androidx.test:rules:1.2.0 -androidx.test:runner:1.2.0 -androidx.transition:transition:1.0.0 -androidx.vectordrawable:vectordrawable-animated:1.1.0 -androidx.vectordrawable:vectordrawable:1.1.0 -androidx.versionedparcelable:versionedparcelable:1.1.0 -androidx.viewpager:viewpager:1.0.0 -com.facebook.testing.screenshot:core:0.12.0 -com.facebook.testing.screenshot:layout-hierarchy-common:0.12.0 -com.google.android.material:material:1.0.0 -com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-android -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.3 -com.squareup.curtains:curtains:1.0.1 -com.squareup.leakcanary:leakcanary-android-core:2.7 -com.squareup.leakcanary:leakcanary-android-instrumentation:2.7 -com.squareup.leakcanary:leakcanary-android-utils:2.7 -com.squareup.leakcanary:leakcanary-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-androidx:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher:2.7 -com.squareup.leakcanary:plumber-android:2.7 -com.squareup.leakcanary:shark-android:2.7 -com.squareup.leakcanary:shark-graph:2.7 -com.squareup.leakcanary:shark-hprof:2.7 -com.squareup.leakcanary:shark-log:2.7 -com.squareup.leakcanary:shark:2.7 -com.squareup:javawriter:2.1.1 -javax.inject:javax.inject:1 -junit:junit:4.12 -net.sf.kxml:kxml2:2.3.0 -org.checkerframework:checker-compat-qual:2.5.5 -org.codehaus.mojo:animal-sniffer-annotations:1.18 -org.hamcrest:hamcrest-core:1.3 -org.hamcrest:hamcrest-integration:1.3 -org.hamcrest:hamcrest-library:1.3 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21 -org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -org.jetbrains:annotations:13.0 diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/debugAndroidTestRuntimeClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/debugAndroidTestRuntimeClasspath.lockfile deleted file mode 100644 index 61f21dd1bf41a..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/debugAndroidTestRuntimeClasspath.lockfile +++ /dev/null @@ -1,59 +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.activity:activity:1.0.0 -androidx.annotation:annotation:1.1.0 -androidx.appcompat:appcompat-resources:1.1.0 -androidx.appcompat:appcompat:1.1.0 -androidx.arch.core:core-common:2.1.0 -androidx.arch.core:core-runtime:2.0.0 -androidx.collection:collection:1.1.0 -androidx.core:core:1.1.0 -androidx.cursoradapter:cursoradapter:1.0.0 -androidx.customview:customview:1.0.0 -androidx.drawerlayout:drawerlayout:1.0.0 -androidx.fragment:fragment:1.1.0 -androidx.interpolator:interpolator:1.0.0 -androidx.lifecycle:lifecycle-common:2.2.0-alpha01 -androidx.lifecycle:lifecycle-livedata-core:2.0.0 -androidx.lifecycle:lifecycle-livedata:2.0.0 -androidx.lifecycle:lifecycle-runtime:2.1.0 -androidx.lifecycle:lifecycle-viewmodel:2.1.0 -androidx.loader:loader:1.0.0 -androidx.savedstate:savedstate:1.0.0 -androidx.test.espresso:espresso-core:3.2.0 -androidx.test.espresso:espresso-idling-resource:3.2.0 -androidx.test:monitor:1.2.0 -androidx.test:rules:1.2.0 -androidx.test:runner:1.2.0 -androidx.vectordrawable:vectordrawable-animated:1.1.0 -androidx.vectordrawable:vectordrawable:1.1.0 -androidx.versionedparcelable:versionedparcelable:1.1.0 -androidx.viewpager:viewpager:1.0.0 -com.facebook.testing.screenshot:core:0.12.0 -com.google.code.findbugs:jsr305:3.0.2 -com.squareup.curtains:curtains:1.0.1 -com.squareup.leakcanary:leakcanary-android-core:2.7 -com.squareup.leakcanary:leakcanary-android-instrumentation:2.7 -com.squareup.leakcanary:leakcanary-android-utils:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-androidx:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher:2.7 -com.squareup.leakcanary:plumber-android:2.7 -com.squareup.leakcanary:shark-android:2.7 -com.squareup.leakcanary:shark-graph:2.7 -com.squareup.leakcanary:shark-hprof:2.7 -com.squareup.leakcanary:shark-log:2.7 -com.squareup.leakcanary:shark:2.7 -com.squareup.okio:okio:2.2.2 -com.squareup:javawriter:2.1.1 -javax.inject:javax.inject:1 -junit:junit:4.12 -net.sf.kxml:kxml2:2.3.0 -org.hamcrest:hamcrest-core:1.3 -org.hamcrest:hamcrest-integration:1.3 -org.hamcrest:hamcrest-library:1.3 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21 -org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -org.jetbrains:annotations:13.0 diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/debugAnnotationProcessorClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/debugAnnotationProcessorClasspath.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/debugAnnotationProcessorClasspath.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/debugCompileClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/debugCompileClasspath.lockfile deleted file mode 100644 index b3187e88737d4..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/debugCompileClasspath.lockfile +++ /dev/null @@ -1,70 +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.activity:activity:1.0.0 -androidx.annotation:annotation:1.1.0 -androidx.appcompat:appcompat-resources:1.1.0 -androidx.appcompat:appcompat:1.1.0 -androidx.arch.core:core-common:2.1.0 -androidx.arch.core:core-runtime:2.0.0 -androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 -androidx.cardview:cardview:1.0.0 -androidx.collection:collection:1.1.0 -androidx.constraintlayout:constraintlayout-solver:1.1.3 -androidx.constraintlayout:constraintlayout:1.1.3 -androidx.coordinatorlayout:coordinatorlayout:1.0.0 -androidx.core:core:1.1.0 -androidx.cursoradapter:cursoradapter:1.0.0 -androidx.customview:customview:1.0.0 -androidx.documentfile:documentfile:1.0.0 -androidx.drawerlayout:drawerlayout:1.0.0 -androidx.fragment:fragment:1.1.0 -androidx.interpolator:interpolator:1.0.0 -androidx.legacy:legacy-support-core-ui:1.0.0 -androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01 -androidx.lifecycle:lifecycle-common:2.2.0-alpha01 -androidx.lifecycle:lifecycle-livedata-core:2.0.0 -androidx.lifecycle:lifecycle-livedata:2.0.0 -androidx.lifecycle:lifecycle-runtime:2.1.0 -androidx.lifecycle:lifecycle-viewmodel:2.1.0 -androidx.loader:loader:1.0.0 -androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -androidx.print:print:1.0.0 -androidx.recyclerview:recyclerview:1.0.0 -androidx.savedstate:savedstate:1.0.0 -androidx.slidingpanelayout:slidingpanelayout:1.0.0 -androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -androidx.transition:transition:1.0.0 -androidx.vectordrawable:vectordrawable-animated:1.1.0 -androidx.vectordrawable:vectordrawable:1.1.0 -androidx.versionedparcelable:versionedparcelable:1.1.0 -androidx.viewpager:viewpager:1.0.0 -com.facebook.testing.screenshot:core:0.12.0 -com.facebook.testing.screenshot:layout-hierarchy-common:0.12.0 -com.google.android.material:material:1.0.0 -com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-android -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.3 -com.squareup.curtains:curtains:1.0.1 -com.squareup.leakcanary:leakcanary-android-core:2.7 -com.squareup.leakcanary:leakcanary-android-utils:2.7 -com.squareup.leakcanary:leakcanary-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-androidx:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher:2.7 -com.squareup.leakcanary:plumber-android:2.7 -com.squareup.leakcanary:shark-android:2.7 -com.squareup.leakcanary:shark-graph:2.7 -com.squareup.leakcanary:shark-hprof:2.7 -com.squareup.leakcanary:shark-log:2.7 -com.squareup.leakcanary:shark:2.7 -org.checkerframework:checker-compat-qual:2.5.5 -org.codehaus.mojo:animal-sniffer-annotations:1.18 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21 -org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -org.jetbrains:annotations:13.0 diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/debugReverseMetadataValues.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/debugReverseMetadataValues.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/debugReverseMetadataValues.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/debugRuntimeClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/debugRuntimeClasspath.lockfile deleted file mode 100644 index e2e77b001c756..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/debugRuntimeClasspath.lockfile +++ /dev/null @@ -1,71 +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.activity:activity:1.0.0 -androidx.annotation:annotation:1.1.0 -androidx.appcompat:appcompat-resources:1.1.0 -androidx.appcompat:appcompat:1.1.0 -androidx.arch.core:core-common:2.1.0 -androidx.arch.core:core-runtime:2.0.0 -androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 -androidx.cardview:cardview:1.0.0 -androidx.collection:collection:1.1.0 -androidx.constraintlayout:constraintlayout-solver:1.1.3 -androidx.constraintlayout:constraintlayout:1.1.3 -androidx.coordinatorlayout:coordinatorlayout:1.0.0 -androidx.core:core:1.1.0 -androidx.cursoradapter:cursoradapter:1.0.0 -androidx.customview:customview:1.0.0 -androidx.documentfile:documentfile:1.0.0 -androidx.drawerlayout:drawerlayout:1.0.0 -androidx.fragment:fragment:1.1.0 -androidx.interpolator:interpolator:1.0.0 -androidx.legacy:legacy-support-core-ui:1.0.0 -androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01 -androidx.lifecycle:lifecycle-common:2.2.0-alpha01 -androidx.lifecycle:lifecycle-livedata-core:2.0.0 -androidx.lifecycle:lifecycle-livedata:2.0.0 -androidx.lifecycle:lifecycle-runtime:2.1.0 -androidx.lifecycle:lifecycle-viewmodel:2.1.0 -androidx.loader:loader:1.0.0 -androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -androidx.print:print:1.0.0 -androidx.recyclerview:recyclerview:1.0.0 -androidx.savedstate:savedstate:1.0.0 -androidx.slidingpanelayout:slidingpanelayout:1.0.0 -androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -androidx.transition:transition:1.0.0 -androidx.vectordrawable:vectordrawable-animated:1.1.0 -androidx.vectordrawable:vectordrawable:1.1.0 -androidx.versionedparcelable:versionedparcelable:1.1.0 -androidx.viewpager:viewpager:1.0.0 -com.facebook.testing.screenshot:core:0.12.0 -com.facebook.testing.screenshot:layout-hierarchy-common:0.12.0 -com.google.android.material:material:1.0.0 -com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-android -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.3 -com.squareup.curtains:curtains:1.0.1 -com.squareup.leakcanary:leakcanary-android-core:2.7 -com.squareup.leakcanary:leakcanary-android-utils:2.7 -com.squareup.leakcanary:leakcanary-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-androidx:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher:2.7 -com.squareup.leakcanary:plumber-android:2.7 -com.squareup.leakcanary:shark-android:2.7 -com.squareup.leakcanary:shark-graph:2.7 -com.squareup.leakcanary:shark-hprof:2.7 -com.squareup.leakcanary:shark-log:2.7 -com.squareup.leakcanary:shark:2.7 -com.squareup.okio:okio:2.2.2 -org.checkerframework:checker-compat-qual:2.5.5 -org.codehaus.mojo:animal-sniffer-annotations:1.18 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21 -org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -org.jetbrains:annotations:13.0 diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/debugUnitTestAnnotationProcessorClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/debugUnitTestAnnotationProcessorClasspath.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/debugUnitTestAnnotationProcessorClasspath.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/debugUnitTestCompileClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/debugUnitTestCompileClasspath.lockfile deleted file mode 100644 index 3dcab19e1c044..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/debugUnitTestCompileClasspath.lockfile +++ /dev/null @@ -1,72 +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.activity:activity:1.0.0 -androidx.annotation:annotation:1.1.0 -androidx.appcompat:appcompat-resources:1.1.0 -androidx.appcompat:appcompat:1.1.0 -androidx.arch.core:core-common:2.1.0 -androidx.arch.core:core-runtime:2.0.0 -androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 -androidx.cardview:cardview:1.0.0 -androidx.collection:collection:1.1.0 -androidx.constraintlayout:constraintlayout-solver:1.1.3 -androidx.constraintlayout:constraintlayout:1.1.3 -androidx.coordinatorlayout:coordinatorlayout:1.0.0 -androidx.core:core:1.1.0 -androidx.cursoradapter:cursoradapter:1.0.0 -androidx.customview:customview:1.0.0 -androidx.documentfile:documentfile:1.0.0 -androidx.drawerlayout:drawerlayout:1.0.0 -androidx.fragment:fragment:1.1.0 -androidx.interpolator:interpolator:1.0.0 -androidx.legacy:legacy-support-core-ui:1.0.0 -androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01 -androidx.lifecycle:lifecycle-common:2.2.0-alpha01 -androidx.lifecycle:lifecycle-livedata-core:2.0.0 -androidx.lifecycle:lifecycle-livedata:2.0.0 -androidx.lifecycle:lifecycle-runtime:2.1.0 -androidx.lifecycle:lifecycle-viewmodel:2.1.0 -androidx.loader:loader:1.0.0 -androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -androidx.print:print:1.0.0 -androidx.recyclerview:recyclerview:1.0.0 -androidx.savedstate:savedstate:1.0.0 -androidx.slidingpanelayout:slidingpanelayout:1.0.0 -androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -androidx.transition:transition:1.0.0 -androidx.vectordrawable:vectordrawable-animated:1.1.0 -androidx.vectordrawable:vectordrawable:1.1.0 -androidx.versionedparcelable:versionedparcelable:1.1.0 -androidx.viewpager:viewpager:1.0.0 -com.facebook.testing.screenshot:core:0.12.0 -com.facebook.testing.screenshot:layout-hierarchy-common:0.12.0 -com.google.android.material:material:1.0.0 -com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-android -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.3 -com.squareup.curtains:curtains:1.0.1 -com.squareup.leakcanary:leakcanary-android-core:2.7 -com.squareup.leakcanary:leakcanary-android-utils:2.7 -com.squareup.leakcanary:leakcanary-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-androidx:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher:2.7 -com.squareup.leakcanary:plumber-android:2.7 -com.squareup.leakcanary:shark-android:2.7 -com.squareup.leakcanary:shark-graph:2.7 -com.squareup.leakcanary:shark-hprof:2.7 -com.squareup.leakcanary:shark-log:2.7 -com.squareup.leakcanary:shark:2.7 -junit:junit:4.12 -org.checkerframework:checker-compat-qual:2.5.5 -org.codehaus.mojo:animal-sniffer-annotations:1.18 -org.hamcrest:hamcrest-core:1.3 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21 -org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -org.jetbrains:annotations:13.0 diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/debugUnitTestRuntimeClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/debugUnitTestRuntimeClasspath.lockfile deleted file mode 100644 index 59714ac255433..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/debugUnitTestRuntimeClasspath.lockfile +++ /dev/null @@ -1,73 +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.activity:activity:1.0.0 -androidx.annotation:annotation:1.1.0 -androidx.appcompat:appcompat-resources:1.1.0 -androidx.appcompat:appcompat:1.1.0 -androidx.arch.core:core-common:2.1.0 -androidx.arch.core:core-runtime:2.0.0 -androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 -androidx.cardview:cardview:1.0.0 -androidx.collection:collection:1.1.0 -androidx.constraintlayout:constraintlayout-solver:1.1.3 -androidx.constraintlayout:constraintlayout:1.1.3 -androidx.coordinatorlayout:coordinatorlayout:1.0.0 -androidx.core:core:1.1.0 -androidx.cursoradapter:cursoradapter:1.0.0 -androidx.customview:customview:1.0.0 -androidx.documentfile:documentfile:1.0.0 -androidx.drawerlayout:drawerlayout:1.0.0 -androidx.fragment:fragment:1.1.0 -androidx.interpolator:interpolator:1.0.0 -androidx.legacy:legacy-support-core-ui:1.0.0 -androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01 -androidx.lifecycle:lifecycle-common:2.2.0-alpha01 -androidx.lifecycle:lifecycle-livedata-core:2.0.0 -androidx.lifecycle:lifecycle-livedata:2.0.0 -androidx.lifecycle:lifecycle-runtime:2.1.0 -androidx.lifecycle:lifecycle-viewmodel:2.1.0 -androidx.loader:loader:1.0.0 -androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -androidx.print:print:1.0.0 -androidx.recyclerview:recyclerview:1.0.0 -androidx.savedstate:savedstate:1.0.0 -androidx.slidingpanelayout:slidingpanelayout:1.0.0 -androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -androidx.transition:transition:1.0.0 -androidx.vectordrawable:vectordrawable-animated:1.1.0 -androidx.vectordrawable:vectordrawable:1.1.0 -androidx.versionedparcelable:versionedparcelable:1.1.0 -androidx.viewpager:viewpager:1.0.0 -com.facebook.testing.screenshot:core:0.12.0 -com.facebook.testing.screenshot:layout-hierarchy-common:0.12.0 -com.google.android.material:material:1.0.0 -com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-android -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.3 -com.squareup.curtains:curtains:1.0.1 -com.squareup.leakcanary:leakcanary-android-core:2.7 -com.squareup.leakcanary:leakcanary-android-utils:2.7 -com.squareup.leakcanary:leakcanary-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-androidx:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher:2.7 -com.squareup.leakcanary:plumber-android:2.7 -com.squareup.leakcanary:shark-android:2.7 -com.squareup.leakcanary:shark-graph:2.7 -com.squareup.leakcanary:shark-hprof:2.7 -com.squareup.leakcanary:shark-log:2.7 -com.squareup.leakcanary:shark:2.7 -com.squareup.okio:okio:2.2.2 -junit:junit:4.12 -org.checkerframework:checker-compat-qual:2.5.5 -org.codehaus.mojo:animal-sniffer-annotations:1.18 -org.hamcrest:hamcrest-core:1.3 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21 -org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -org.jetbrains:annotations:13.0 diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/debugWearBundling.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/debugWearBundling.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/debugWearBundling.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/lintChecks.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/lintChecks.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/lintChecks.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/lintClassPath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/lintClassPath.lockfile deleted file mode 100644 index 0c1c63da9f2a8..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/lintClassPath.lockfile +++ /dev/null @@ -1,83 +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. -com.android.tools.analytics-library:protos:27.2.0 -com.android.tools.analytics-library:shared:27.2.0 -com.android.tools.analytics-library:tracker:27.2.0 -com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524 -com.android.tools.build:apksig:4.2.0 -com.android.tools.build:apkzlib:4.2.0 -com.android.tools.build:builder-model:4.2.0 -com.android.tools.build:builder-test-api:4.2.0 -com.android.tools.build:builder:4.2.0 -com.android.tools.build:gradle-api:4.2.0 -com.android.tools.build:manifest-merger:27.2.0 -com.android.tools.ddms:ddmlib:27.2.0 -com.android.tools.external.com-intellij:intellij-core:27.2.0 -com.android.tools.external.com-intellij:kotlin-compiler:27.2.0 -com.android.tools.external.org-jetbrains:uast:27.2.0 -com.android.tools.layoutlib:layoutlib-api:27.2.0 -com.android.tools.lint:lint-api:27.2.0 -com.android.tools.lint:lint-checks:27.2.0 -com.android.tools.lint:lint-gradle-api:27.2.0 -com.android.tools.lint:lint-gradle:27.2.0 -com.android.tools.lint:lint-model:27.2.0 -com.android.tools.lint:lint:27.2.0 -com.android.tools:annotations:27.2.0 -com.android.tools:common:27.2.0 -com.android.tools:dvlib:27.2.0 -com.android.tools:repository:27.2.0 -com.android.tools:sdk-common:27.2.0 -com.android.tools:sdklib:27.2.0 -com.android:signflinger:4.2.0 -com.android:zipflinger:4.2.0 -com.google.code.findbugs:jsr305:3.0.2 -com.google.code.gson:gson:2.8.6 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.3 -com.google.jimfs:jimfs:1.1 -com.google.protobuf:protobuf-java:3.10.0 -com.googlecode.json-simple:json-simple:1.1 -com.squareup:javawriter:2.5.0 -com.sun.activation:javax.activation:1.2.0 -com.sun.istack:istack-commons-runtime:3.0.8 -com.sun.xml.fastinfoset:FastInfoset:1.2.16 -commons-codec:commons-codec:1.10 -commons-logging:commons-logging:1.2 -it.unimi.dsi:fastutil:8.4.0 -jakarta.activation:jakarta.activation-api:1.2.1 -jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 -javax.inject:javax.inject:1 -net.java.dev.jna:jna-platform:5.6.0 -net.java.dev.jna:jna:5.6.0 -net.sf.jopt-simple:jopt-simple:4.9 -net.sf.kxml:kxml2:2.3.0 -org.apache.commons:commons-compress:1.12 -org.apache.httpcomponents:httpclient:4.5.6 -org.apache.httpcomponents:httpcore:4.4.10 -org.apache.httpcomponents:httpmime:4.5.6 -org.bouncycastle:bcpkix-jdk15on:1.56 -org.bouncycastle:bcprov-jdk15on:1.56 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.groovy:groovy-all:2.4.15 -org.codehaus.mojo:animal-sniffer-annotations:1.18 -org.glassfish.jaxb:jaxb-runtime:2.3.2 -org.glassfish.jaxb:txw2:2.3.2 -org.jetbrains.intellij.deps:trove4j:1.0.20181211 -org.jetbrains.kotlin:kotlin-reflect:1.4.31 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31 -org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -org.jetbrains:annotations:13.0 -org.jvnet.staxex:stax-ex:1.8.1 -org.ow2.asm:asm-analysis:7.0 -org.ow2.asm:asm-commons:7.0 -org.ow2.asm:asm-tree:7.0 -org.ow2.asm:asm-util:7.0 -org.ow2.asm:asm:7.0 -xerces:xercesImpl:2.12.0 -xml-apis:xml-apis:1.4.01 diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/lintPublish.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/lintPublish.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/lintPublish.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/releaseAnnotationProcessorClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/releaseAnnotationProcessorClasspath.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/releaseAnnotationProcessorClasspath.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/releaseCompileClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/releaseCompileClasspath.lockfile deleted file mode 100644 index b3187e88737d4..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/releaseCompileClasspath.lockfile +++ /dev/null @@ -1,70 +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.activity:activity:1.0.0 -androidx.annotation:annotation:1.1.0 -androidx.appcompat:appcompat-resources:1.1.0 -androidx.appcompat:appcompat:1.1.0 -androidx.arch.core:core-common:2.1.0 -androidx.arch.core:core-runtime:2.0.0 -androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 -androidx.cardview:cardview:1.0.0 -androidx.collection:collection:1.1.0 -androidx.constraintlayout:constraintlayout-solver:1.1.3 -androidx.constraintlayout:constraintlayout:1.1.3 -androidx.coordinatorlayout:coordinatorlayout:1.0.0 -androidx.core:core:1.1.0 -androidx.cursoradapter:cursoradapter:1.0.0 -androidx.customview:customview:1.0.0 -androidx.documentfile:documentfile:1.0.0 -androidx.drawerlayout:drawerlayout:1.0.0 -androidx.fragment:fragment:1.1.0 -androidx.interpolator:interpolator:1.0.0 -androidx.legacy:legacy-support-core-ui:1.0.0 -androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01 -androidx.lifecycle:lifecycle-common:2.2.0-alpha01 -androidx.lifecycle:lifecycle-livedata-core:2.0.0 -androidx.lifecycle:lifecycle-livedata:2.0.0 -androidx.lifecycle:lifecycle-runtime:2.1.0 -androidx.lifecycle:lifecycle-viewmodel:2.1.0 -androidx.loader:loader:1.0.0 -androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -androidx.print:print:1.0.0 -androidx.recyclerview:recyclerview:1.0.0 -androidx.savedstate:savedstate:1.0.0 -androidx.slidingpanelayout:slidingpanelayout:1.0.0 -androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -androidx.transition:transition:1.0.0 -androidx.vectordrawable:vectordrawable-animated:1.1.0 -androidx.vectordrawable:vectordrawable:1.1.0 -androidx.versionedparcelable:versionedparcelable:1.1.0 -androidx.viewpager:viewpager:1.0.0 -com.facebook.testing.screenshot:core:0.12.0 -com.facebook.testing.screenshot:layout-hierarchy-common:0.12.0 -com.google.android.material:material:1.0.0 -com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-android -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.3 -com.squareup.curtains:curtains:1.0.1 -com.squareup.leakcanary:leakcanary-android-core:2.7 -com.squareup.leakcanary:leakcanary-android-utils:2.7 -com.squareup.leakcanary:leakcanary-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-androidx:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher:2.7 -com.squareup.leakcanary:plumber-android:2.7 -com.squareup.leakcanary:shark-android:2.7 -com.squareup.leakcanary:shark-graph:2.7 -com.squareup.leakcanary:shark-hprof:2.7 -com.squareup.leakcanary:shark-log:2.7 -com.squareup.leakcanary:shark:2.7 -org.checkerframework:checker-compat-qual:2.5.5 -org.codehaus.mojo:animal-sniffer-annotations:1.18 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21 -org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -org.jetbrains:annotations:13.0 diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/releaseReverseMetadataValues.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/releaseReverseMetadataValues.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/releaseReverseMetadataValues.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/releaseRuntimeClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/releaseRuntimeClasspath.lockfile deleted file mode 100644 index e2e77b001c756..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/releaseRuntimeClasspath.lockfile +++ /dev/null @@ -1,71 +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.activity:activity:1.0.0 -androidx.annotation:annotation:1.1.0 -androidx.appcompat:appcompat-resources:1.1.0 -androidx.appcompat:appcompat:1.1.0 -androidx.arch.core:core-common:2.1.0 -androidx.arch.core:core-runtime:2.0.0 -androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 -androidx.cardview:cardview:1.0.0 -androidx.collection:collection:1.1.0 -androidx.constraintlayout:constraintlayout-solver:1.1.3 -androidx.constraintlayout:constraintlayout:1.1.3 -androidx.coordinatorlayout:coordinatorlayout:1.0.0 -androidx.core:core:1.1.0 -androidx.cursoradapter:cursoradapter:1.0.0 -androidx.customview:customview:1.0.0 -androidx.documentfile:documentfile:1.0.0 -androidx.drawerlayout:drawerlayout:1.0.0 -androidx.fragment:fragment:1.1.0 -androidx.interpolator:interpolator:1.0.0 -androidx.legacy:legacy-support-core-ui:1.0.0 -androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01 -androidx.lifecycle:lifecycle-common:2.2.0-alpha01 -androidx.lifecycle:lifecycle-livedata-core:2.0.0 -androidx.lifecycle:lifecycle-livedata:2.0.0 -androidx.lifecycle:lifecycle-runtime:2.1.0 -androidx.lifecycle:lifecycle-viewmodel:2.1.0 -androidx.loader:loader:1.0.0 -androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -androidx.print:print:1.0.0 -androidx.recyclerview:recyclerview:1.0.0 -androidx.savedstate:savedstate:1.0.0 -androidx.slidingpanelayout:slidingpanelayout:1.0.0 -androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -androidx.transition:transition:1.0.0 -androidx.vectordrawable:vectordrawable-animated:1.1.0 -androidx.vectordrawable:vectordrawable:1.1.0 -androidx.versionedparcelable:versionedparcelable:1.1.0 -androidx.viewpager:viewpager:1.0.0 -com.facebook.testing.screenshot:core:0.12.0 -com.facebook.testing.screenshot:layout-hierarchy-common:0.12.0 -com.google.android.material:material:1.0.0 -com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-android -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.3 -com.squareup.curtains:curtains:1.0.1 -com.squareup.leakcanary:leakcanary-android-core:2.7 -com.squareup.leakcanary:leakcanary-android-utils:2.7 -com.squareup.leakcanary:leakcanary-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-androidx:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher:2.7 -com.squareup.leakcanary:plumber-android:2.7 -com.squareup.leakcanary:shark-android:2.7 -com.squareup.leakcanary:shark-graph:2.7 -com.squareup.leakcanary:shark-hprof:2.7 -com.squareup.leakcanary:shark-log:2.7 -com.squareup.leakcanary:shark:2.7 -com.squareup.okio:okio:2.2.2 -org.checkerframework:checker-compat-qual:2.5.5 -org.codehaus.mojo:animal-sniffer-annotations:1.18 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21 -org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -org.jetbrains:annotations:13.0 diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/releaseUnitTestAnnotationProcessorClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/releaseUnitTestAnnotationProcessorClasspath.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/releaseUnitTestAnnotationProcessorClasspath.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/releaseUnitTestCompileClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/releaseUnitTestCompileClasspath.lockfile deleted file mode 100644 index 3dcab19e1c044..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/releaseUnitTestCompileClasspath.lockfile +++ /dev/null @@ -1,72 +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.activity:activity:1.0.0 -androidx.annotation:annotation:1.1.0 -androidx.appcompat:appcompat-resources:1.1.0 -androidx.appcompat:appcompat:1.1.0 -androidx.arch.core:core-common:2.1.0 -androidx.arch.core:core-runtime:2.0.0 -androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 -androidx.cardview:cardview:1.0.0 -androidx.collection:collection:1.1.0 -androidx.constraintlayout:constraintlayout-solver:1.1.3 -androidx.constraintlayout:constraintlayout:1.1.3 -androidx.coordinatorlayout:coordinatorlayout:1.0.0 -androidx.core:core:1.1.0 -androidx.cursoradapter:cursoradapter:1.0.0 -androidx.customview:customview:1.0.0 -androidx.documentfile:documentfile:1.0.0 -androidx.drawerlayout:drawerlayout:1.0.0 -androidx.fragment:fragment:1.1.0 -androidx.interpolator:interpolator:1.0.0 -androidx.legacy:legacy-support-core-ui:1.0.0 -androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01 -androidx.lifecycle:lifecycle-common:2.2.0-alpha01 -androidx.lifecycle:lifecycle-livedata-core:2.0.0 -androidx.lifecycle:lifecycle-livedata:2.0.0 -androidx.lifecycle:lifecycle-runtime:2.1.0 -androidx.lifecycle:lifecycle-viewmodel:2.1.0 -androidx.loader:loader:1.0.0 -androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -androidx.print:print:1.0.0 -androidx.recyclerview:recyclerview:1.0.0 -androidx.savedstate:savedstate:1.0.0 -androidx.slidingpanelayout:slidingpanelayout:1.0.0 -androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -androidx.transition:transition:1.0.0 -androidx.vectordrawable:vectordrawable-animated:1.1.0 -androidx.vectordrawable:vectordrawable:1.1.0 -androidx.versionedparcelable:versionedparcelable:1.1.0 -androidx.viewpager:viewpager:1.0.0 -com.facebook.testing.screenshot:core:0.12.0 -com.facebook.testing.screenshot:layout-hierarchy-common:0.12.0 -com.google.android.material:material:1.0.0 -com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-android -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.3 -com.squareup.curtains:curtains:1.0.1 -com.squareup.leakcanary:leakcanary-android-core:2.7 -com.squareup.leakcanary:leakcanary-android-utils:2.7 -com.squareup.leakcanary:leakcanary-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-androidx:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher:2.7 -com.squareup.leakcanary:plumber-android:2.7 -com.squareup.leakcanary:shark-android:2.7 -com.squareup.leakcanary:shark-graph:2.7 -com.squareup.leakcanary:shark-hprof:2.7 -com.squareup.leakcanary:shark-log:2.7 -com.squareup.leakcanary:shark:2.7 -junit:junit:4.12 -org.checkerframework:checker-compat-qual:2.5.5 -org.codehaus.mojo:animal-sniffer-annotations:1.18 -org.hamcrest:hamcrest-core:1.3 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21 -org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -org.jetbrains:annotations:13.0 diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/releaseUnitTestRuntimeClasspath.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/releaseUnitTestRuntimeClasspath.lockfile deleted file mode 100644 index 59714ac255433..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/releaseUnitTestRuntimeClasspath.lockfile +++ /dev/null @@ -1,73 +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.activity:activity:1.0.0 -androidx.annotation:annotation:1.1.0 -androidx.appcompat:appcompat-resources:1.1.0 -androidx.appcompat:appcompat:1.1.0 -androidx.arch.core:core-common:2.1.0 -androidx.arch.core:core-runtime:2.0.0 -androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 -androidx.cardview:cardview:1.0.0 -androidx.collection:collection:1.1.0 -androidx.constraintlayout:constraintlayout-solver:1.1.3 -androidx.constraintlayout:constraintlayout:1.1.3 -androidx.coordinatorlayout:coordinatorlayout:1.0.0 -androidx.core:core:1.1.0 -androidx.cursoradapter:cursoradapter:1.0.0 -androidx.customview:customview:1.0.0 -androidx.documentfile:documentfile:1.0.0 -androidx.drawerlayout:drawerlayout:1.0.0 -androidx.fragment:fragment:1.1.0 -androidx.interpolator:interpolator:1.0.0 -androidx.legacy:legacy-support-core-ui:1.0.0 -androidx.legacy:legacy-support-core-utils:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.2.0-alpha01 -androidx.lifecycle:lifecycle-common:2.2.0-alpha01 -androidx.lifecycle:lifecycle-livedata-core:2.0.0 -androidx.lifecycle:lifecycle-livedata:2.0.0 -androidx.lifecycle:lifecycle-runtime:2.1.0 -androidx.lifecycle:lifecycle-viewmodel:2.1.0 -androidx.loader:loader:1.0.0 -androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -androidx.print:print:1.0.0 -androidx.recyclerview:recyclerview:1.0.0 -androidx.savedstate:savedstate:1.0.0 -androidx.slidingpanelayout:slidingpanelayout:1.0.0 -androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -androidx.transition:transition:1.0.0 -androidx.vectordrawable:vectordrawable-animated:1.1.0 -androidx.vectordrawable:vectordrawable:1.1.0 -androidx.versionedparcelable:versionedparcelable:1.1.0 -androidx.viewpager:viewpager:1.0.0 -com.facebook.testing.screenshot:core:0.12.0 -com.facebook.testing.screenshot:layout-hierarchy-common:0.12.0 -com.google.android.material:material:1.0.0 -com.google.code.findbugs:jsr305:3.0.2 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-android -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.3 -com.squareup.curtains:curtains:1.0.1 -com.squareup.leakcanary:leakcanary-android-core:2.7 -com.squareup.leakcanary:leakcanary-android-utils:2.7 -com.squareup.leakcanary:leakcanary-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-androidx:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android-support-fragments:2.7 -com.squareup.leakcanary:leakcanary-object-watcher-android:2.7 -com.squareup.leakcanary:leakcanary-object-watcher:2.7 -com.squareup.leakcanary:plumber-android:2.7 -com.squareup.leakcanary:shark-android:2.7 -com.squareup.leakcanary:shark-graph:2.7 -com.squareup.leakcanary:shark-hprof:2.7 -com.squareup.leakcanary:shark-log:2.7 -com.squareup.leakcanary:shark:2.7 -com.squareup.okio:okio:2.2.2 -junit:junit:4.12 -org.checkerframework:checker-compat-qual:2.5.5 -org.codehaus.mojo:animal-sniffer-annotations:1.18 -org.hamcrest:hamcrest-core:1.3 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21 -org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -org.jetbrains:annotations:13.0 diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/releaseWearBundling.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/releaseWearBundling.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/releaseWearBundling.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/gradle/dependency-locks/testCompile.lockfile b/testing/scenario_app/android/app/gradle/dependency-locks/testCompile.lockfile deleted file mode 100644 index 656c5dbccf1df..0000000000000 --- a/testing/scenario_app/android/app/gradle/dependency-locks/testCompile.lockfile +++ /dev/null @@ -1,3 +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. diff --git a/testing/scenario_app/android/app/src/main/AndroidManifest.xml b/testing/scenario_app/android/app/src/main/AndroidManifest.xml index 9bf9f582ffbaa..4f65e21e5ddf4 100644 --- a/testing/scenario_app/android/app/src/main/AndroidManifest.xml +++ b/testing/scenario_app/android/app/src/main/AndroidManifest.xml @@ -14,7 +14,8 @@ android:hardwareAccelerated="true" android:launchMode="singleTop" android:windowSoftInputMode="adjustResize" - android:theme="@style/FullScreenScreenshot"> + android:theme="@style/FullScreenScreenshot" + android:exported="true"> @@ -31,7 +32,8 @@ android:hardwareAccelerated="true" android:launchMode="singleTop" android:windowSoftInputMode="adjustResize" - android:theme="@style/FullScreenScreenshot"> + android:theme="@style/FullScreenScreenshot" + android:exported="true"> @@ -40,7 +42,8 @@ + android:hardwareAccelerated="true" + android:exported="true"> diff --git a/testing/scenario_app/android/build.gradle b/testing/scenario_app/android/build.gradle index d6ae15a6b4a62..6998430908818 100644 --- a/testing/scenario_app/android/build.gradle +++ b/testing/scenario_app/android/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0' + classpath 'com.android.tools.build:gradle:7.0.0' classpath 'com.facebook.testing.screenshot:plugin:0.12.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/testing/scenario_app/android/buildscript-gradle.lockfile b/testing/scenario_app/android/buildscript-gradle.lockfile new file mode 100644 index 0000000000000..ecd1c6f9730cf --- /dev/null +++ b/testing/scenario_app/android/buildscript-gradle.lockfile @@ -0,0 +1,123 @@ +# 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: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: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: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.facebook.testing.screenshot:plugin:0.12.0=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.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: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.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.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 +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 +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 +org.antlr:antlr4:4.5.3=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: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-reflect:1.4.32=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:annotations:13.0=classpath +org.json:json:20180813=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-rc2=classpath +xerces:xercesImpl:2.12.0=classpath +xml-apis:xml-apis:1.4.01=classpath +empty= diff --git a/testing/scenario_app/android/gradle/dependency-locks/buildscript-classpath.lockfile b/testing/scenario_app/android/gradle/dependency-locks/buildscript-classpath.lockfile deleted file mode 100644 index d20f3a79fb634..0000000000000 --- a/testing/scenario_app/android/gradle/dependency-locks/buildscript-classpath.lockfile +++ /dev/null @@ -1,101 +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.2.0 -androidx.databinding:databinding-compiler-common:4.2.0 -com.android.databinding:baseLibrary:4.2.0 -com.android.tools.analytics-library:crash:27.2.0 -com.android.tools.analytics-library:protos:27.2.0 -com.android.tools.analytics-library:shared:27.2.0 -com.android.tools.analytics-library:tracker:27.2.0 -com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09 -com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09 -com.android.tools.build:aapt2-proto:4.2.0-7147631 -com.android.tools.build:aaptcompiler:4.2.0 -com.android.tools.build:apksig:4.2.0 -com.android.tools.build:apkzlib:4.2.0 -com.android.tools.build:builder-model:4.2.0 -com.android.tools.build:builder-test-api:4.2.0 -com.android.tools.build:builder:4.2.0 -com.android.tools.build:bundletool:1.1.0 -com.android.tools.build:gradle-api:4.2.0 -com.android.tools.build:gradle:4.2.0 -com.android.tools.build:manifest-merger:27.2.0 -com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api -com.android.tools.ddms:ddmlib:27.2.0 -com.android.tools.layoutlib:layoutlib-api:27.2.0 -com.android.tools.lint:lint-gradle-api:27.2.0 -com.android.tools.lint:lint-model:27.2.0 -com.android.tools:annotations:27.2.0 -com.android.tools:common:27.2.0 -com.android.tools:dvlib:27.2.0 -com.android.tools:repository:27.2.0 -com.android.tools:sdk-common:27.2.0 -com.android.tools:sdklib:27.2.0 -com.android:signflinger:4.2.0 -com.android:zipflinger:4.2.0 -com.facebook.testing.screenshot:plugin:0.12.0 -com.google.auto.value:auto-value-annotations:1.6.2 -com.google.code.findbugs:jsr305:3.0.2 -com.google.code.gson:gson:2.8.6 -com.google.crypto.tink:tink:1.3.0-rc2 -com.google.dagger:dagger:2.28.3 -com.google.errorprone:error_prone_annotations:2.3.2 -com.google.flatbuffers:flatbuffers-java:1.12.0 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:28.1-jre -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.3 -com.google.jimfs:jimfs:1.1 -com.google.protobuf:protobuf-java-util:3.10.0 -com.google.protobuf:protobuf-java:3.10.0 -com.google.testing.platform:core-proto:0.0.8-alpha01 -com.googlecode.json-simple:json-simple:1.1 -com.googlecode.juniversalchardet:juniversalchardet:1.0.3 -com.squareup:javapoet:1.10.0 -com.squareup:javawriter:2.5.0 -com.sun.activation:javax.activation:1.2.0 -com.sun.istack:istack-commons-runtime:3.0.8 -com.sun.xml.fastinfoset:FastInfoset:1.2.16 -commons-codec:commons-codec:1.10 -commons-io:commons-io:2.4 -commons-logging:commons-logging:1.2 -it.unimi.dsi:fastutil:8.4.0 -jakarta.activation:jakarta.activation-api:1.2.1 -jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 -javax.inject:javax.inject:1 -net.java.dev.jna:jna-platform:5.6.0 -net.java.dev.jna:jna:5.6.0 -net.sf.jopt-simple:jopt-simple:4.9 -net.sf.kxml:kxml2:2.3.0 -net.sf.proguard:proguard-base:6.0.3 -net.sf.proguard:proguard-gradle:6.0.3 -org.antlr:antlr4:4.5.3 -org.apache.commons:commons-compress:1.12 -org.apache.httpcomponents:httpclient:4.5.6 -org.apache.httpcomponents:httpcore:4.4.10 -org.apache.httpcomponents:httpmime:4.5.6 -org.bouncycastle:bcpkix-jdk15on:1.56 -org.bouncycastle:bcprov-jdk15on:1.56 -org.checkerframework:checker-qual:2.8.1 -org.codehaus.mojo:animal-sniffer-annotations:1.18 -org.glassfish.jaxb:jaxb-runtime:2.3.2 -org.glassfish.jaxb:txw2:2.3.2 -org.jdom:jdom2:2.0.6 -org.jetbrains.intellij.deps:trove4j:1.0.20181211 -org.jetbrains.kotlin:kotlin-reflect:1.4.31 -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31 -org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -org.jetbrains:annotations:13.0 -org.json:json:20180813 -org.jvnet.staxex:stax-ex:1.8.1 -org.ow2.asm:asm-analysis:7.0 -org.ow2.asm:asm-commons:7.0 -org.ow2.asm:asm-tree:7.0 -org.ow2.asm:asm-util:7.0 -org.ow2.asm:asm:7.0 -org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2 -xerces:xercesImpl:2.12.0 -xml-apis:xml-apis:1.4.01 diff --git a/testing/scenario_app/android/gradle/wrapper/gradle-wrapper.properties b/testing/scenario_app/android/gradle/wrapper/gradle-wrapper.properties index 56db662b86061..9178380026591 100644 --- a/testing/scenario_app/android/gradle/wrapper/gradle-wrapper.properties +++ b/testing/scenario_app/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.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/tools/android_lint/project.xml b/tools/android_lint/project.xml index 12b7f1b90aa9b..2b450c5304e8f 100644 --- a/tools/android_lint/project.xml +++ b/tools/android_lint/project.xml @@ -13,6 +13,7 @@ + diff --git a/tools/cipd/android_embedding_bundle/build.gradle b/tools/cipd/android_embedding_bundle/build.gradle index 7c5ee796c86c0..e93098cf2ed7e 100644 --- a/tools/cipd/android_embedding_bundle/build.gradle +++ b/tools/cipd/android_embedding_bundle/build.gradle @@ -37,7 +37,7 @@ configurations { } android { - compileSdkVersion 30 + compileSdkVersion 31 dependencies { embedding "androidx.annotation:annotation:1.1.0" diff --git a/tools/create_sdk_cipd_package.sh b/tools/create_sdk_cipd_package.sh index a67a7ebf50877..63b9b50b0529e 100755 --- a/tools/create_sdk_cipd_package.sh +++ b/tools/create_sdk_cipd_package.sh @@ -5,10 +5,21 @@ print_usage () { echo "Usage: create_sdk_cipd_package.sh " echo " where:" - echo " - PACKAGE_TYPE is one of build-tools, platform-tools, platforms, or tools" + echo " - PACKAGE_TYPE is one of build-tools, platform-tools, platforms, tools, or cmdline-tools;latest" echo " - PATH_TO_ASSETS is the path to the unzipped asset folder" echo " - PLATFORM_NAME is one of linux-amd64, mac-amd64, or windows-amd64" echo " - VERSION_TAG is the version of the package, e.g. 28r6 or 28.0.3" + echo "" + echo "To download the packages, you would need to use sdkmanager, and" + echo "use the env variable REPO_OS_OVERRIDE=(linux|windows|macosx) to override the host platform." + echo "For example: REPO_OS_OVERRIDE=linux sdkmanager \"platform-tools\"." + echo "Gotchas:". + echo "* sdkmanager downloads the binaries to the Android SDK location (Check ANDROID_HOME or ANDROID_SDK_ROOT)." + echo "* PATH_TO_ASSETS is the path to that ends with the package type. e.g. /platforms" + echo "* When you change REPO_OS_OVERRIDE, you would also need to delete the directory from the" + echo "Android SDK location, so sdkmanager tries to download the binaries for the new platform." + echo "" + echo "For more see: https://developer.android.com/studio/command-line/sdkmanager" } if [[ $4 == "" ]]; then diff --git a/tools/gen_javadoc.py b/tools/gen_javadoc.py index 3ecc7d59b2b83..6a35a13b8cf03 100755 --- a/tools/gen_javadoc.py +++ b/tools/gen_javadoc.py @@ -41,7 +41,7 @@ def main(): classpath = [ args.android_source_root, - os.path.join(args.third_party, 'android_tools/sdk//platforms/android-30/android.jar'), + os.path.join(args.third_party, 'android_tools/sdk/platforms/android-31/android.jar'), os.path.join(args.third_party, 'android_embedding_dependencies', 'lib', '*'), ] if args.build_config_path: