From f7025e7ee8a2b6146e58401de9d013ac0e9a4897 Mon Sep 17 00:00:00 2001 From: PravinBagde Date: Sat, 3 Jun 2023 09:54:37 +0530 Subject: [PATCH] Downgrade AGP from 7.3.0 to 7.2.2 AGP -> Android Gradle Plugin, which must not be confused with Gradle version of the project. --- android/gradle.properties | 2 +- nix/deps/gradle/deps.json | 623 +++++++++++++++++++++++++++++++++--- nix/deps/gradle/deps.list | 37 ++- nix/deps/gradle/deps.urls | 49 ++- nix/deps/gradle/generate.sh | 2 +- nix/pkgs/aapt2/default.nix | 12 +- 6 files changed, 660 insertions(+), 65 deletions(-) diff --git a/android/gradle.properties b/android/gradle.properties index 23f59e900fef..5311aabeec09 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -28,7 +28,7 @@ targetSdkVersion=31 buildToolsVersion=31.0.0 supportLibVersion=28.0.0 # This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix -gradlePluginVersion=7.3.0 +gradlePluginVersion=7.2.2 kotlinPluginVersion=1.6.20 android.useAndroidX=true diff --git a/nix/deps/gradle/deps.json b/nix/deps/gradle/deps.json index 868ee1a81c6d..91186f421ec5 100644 --- a/nix/deps/gradle/deps.json +++ b/nix/deps/gradle/deps.json @@ -824,6 +824,21 @@ } }, + { + "path": "androidx/databinding/databinding-common/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "databinding-common-7.2.2.pom": { + "sha1": "86a95236f990f07b57f0e8582695ffdd3e1d728a", + "sha256": "sha256-QmAW1RcSr9bkeJ0OmBC5Ppyu58HcoA19JCV7xHd+Sds=" + }, + "databinding-common-7.2.2.jar": { + "sha1": "0cb53bd625b7a99cf218f46634d07d1886441288", + "sha256": "sha256-hS5GWkknHbx/ar++NnNorrbTEwofqvlhfMud5hGNHKI=" + } + } + }, + { "path": "androidx/databinding/databinding-common/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -929,6 +944,21 @@ } }, + { + "path": "androidx/databinding/databinding-compiler-common/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "databinding-compiler-common-7.2.2.pom": { + "sha1": "568c89f1f682dbbc1c11d6fc5031129cdc4f5bb4", + "sha256": "sha256-yfgj8rBXFXCRspUzJ+Okv3w/x/JZuflrgK2kAOQFHik=" + }, + "databinding-compiler-common-7.2.2.jar": { + "sha1": "01126a86185a1ace3540bb13747bf97c8e93df73", + "sha256": "sha256-4dMWQOc/BuUpyPA9wHTi2nBJbTrBiNjLyP22A23R9gc=" + } + } + }, + { "path": "androidx/databinding/databinding-compiler-common/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -2009,6 +2039,21 @@ } }, + { + "path": "com/android/databinding/baseLibrary/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "baseLibrary-7.2.2.pom": { + "sha1": "e392396d5bf084d1ac6c7c4980405a193ac09c3e", + "sha256": "sha256-J+yUYjdaEi3VG2uA78rx8LDIlNdy1+DgCP4rkT4tg60=" + }, + "baseLibrary-7.2.2.jar": { + "sha1": "64ab5b22730b44026db99a1403ceec3275468edd", + "sha256": "sha256-uZAFd9Ihl4RJJBTTYTA+7ksUlxrlLi16i9Z6M8Fjb5U=" + } + } + }, + { "path": "com/android/databinding/baseLibrary/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -2099,6 +2144,21 @@ } }, + { + "path": "com/android/signflinger/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "signflinger-7.2.2.pom": { + "sha1": "8b1ad42170306acdeebd9b59c8d22b4c5f6ddf7a", + "sha256": "sha256-gAS10ALLTMP+SiFpyTPT8sfMAAhKsw7Hy7cU8Us6Qlg=" + }, + "signflinger-7.2.2.jar": { + "sha1": "92b0db3c63249ae6ba21f9543b34e7e6a76c92a3", + "sha256": "sha256-H8E5eXa2kKnaDysswDePwwuOOJ+rZYB0/mvOqouXGuc=" + } + } + }, + { "path": "com/android/signflinger/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -2504,6 +2564,21 @@ } }, + { + "path": "com/android/tools/analytics-library/crash/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "crash-30.2.2.pom": { + "sha1": "1820f50347677313e550d017741eb21eea27354e", + "sha256": "sha256-dxAIFqrVjn8cTbc7DdvSenAUCwREbTKDXtvNmAhHnQ8=" + }, + "crash-30.2.2.jar": { + "sha1": "cc206cb0ead9f1a882d29aeb070437c5bf5eed63", + "sha256": "sha256-baLqK1OCRoRlYNi/HTJRcEDCl+3voNz9witKmpVPMe0=" + } + } + }, + { "path": "com/android/tools/analytics-library/crash/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -2639,6 +2714,21 @@ } }, + { + "path": "com/android/tools/analytics-library/protos/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "protos-30.2.2.pom": { + "sha1": "33e5bed32a4dfca07f1b41d768369ad146567db1", + "sha256": "sha256-Yd2llhV+wjjPHjbeZPKoIT850itIHV0yQ2maeq42gZw=" + }, + "protos-30.2.2.jar": { + "sha1": "7a4b54b151a2def037f1c384de4cb4af9c5ecdb4", + "sha256": "sha256-/rKTpNF1okzn+Y1/eDZw2B2rYSYM+bvT10jpT5XjiJI=" + } + } + }, + { "path": "com/android/tools/analytics-library/protos/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -2774,6 +2864,21 @@ } }, + { + "path": "com/android/tools/analytics-library/shared/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "shared-30.2.2.pom": { + "sha1": "3cc533e3a3c7a5ae458a15624ae2d10c090f71f5", + "sha256": "sha256-3vJffH0qcv7xezGLVgBLiYuJn0T1GRjryiGsd7bRods=" + }, + "shared-30.2.2.jar": { + "sha1": "6a126598a23ee92cb3dc722c146d457593c5bbbf", + "sha256": "sha256-JRK/eNyJabAgaEHOmWNptactSQxC5chBDDpitFWwkps=" + } + } + }, + { "path": "com/android/tools/analytics-library/shared/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -2909,6 +3014,21 @@ } }, + { + "path": "com/android/tools/analytics-library/tracker/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "tracker-30.2.2.pom": { + "sha1": "fadc4f000c746be262a255141072b553437fd1b2", + "sha256": "sha256-EDzzoYA8rMrrYylROK1gtZFXUWfd/QQMFoHpzweIpMA=" + }, + "tracker-30.2.2.jar": { + "sha1": "ca5952946e17509429bb608c98bc87c76b196503", + "sha256": "sha256-OpYc1rDJRFtHwY0FFrU0vfCU+TFRGXiW9ID4eYaXxyk=" + } + } + }, + { "path": "com/android/tools/analytics-library/tracker/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -3044,6 +3164,21 @@ } }, + { + "path": "com/android/tools/annotations/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "annotations-30.2.2.pom": { + "sha1": "0624fbe3f5eda817f8b2588773763faaa3c0cb05", + "sha256": "sha256-Y+Zd1vBhW7SJprfJHSe6hWX8dTVl/B7svAg55Q6r25Y=" + }, + "annotations-30.2.2.jar": { + "sha1": "e0254d7202df74359763abadb4cb48e2ad0365e6", + "sha256": "sha256-Ywq0xvIR+hwPXIhBUstjETYPG3lkQhlsKHplhkWplkU=" + } + } + }, + { "path": "com/android/tools/annotations/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -3164,6 +3299,21 @@ } }, + { + "path": "com/android/tools/build/aapt2-proto/7.2.2-7984345", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "aapt2-proto-7.2.2-7984345.pom": { + "sha1": "7fd7b42066bdb799baa79b13448d0474020f6199", + "sha256": "sha256-Fa3LY5YaG090PHUjv6UoyZc9ZBJcR1mWHN1GoN45KoQ=" + }, + "aapt2-proto-7.2.2-7984345.jar": { + "sha1": "fecb9786700f740dd1bdfc75359cb4bb1ae47463", + "sha256": "sha256-3JA4UsSo6n4GVSAOWcqmqLiCdMGuOC/8HjN8B7CAW+Q=" + } + } + }, + { "path": "com/android/tools/build/aapt2-proto/7.3.0-8691043", "repo": "https://dl.google.com/dl/android/maven2", @@ -3224,6 +3374,21 @@ } }, + { + "path": "com/android/tools/build/aaptcompiler/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "aaptcompiler-7.2.2.pom": { + "sha1": "82ff9f850032b6f701e9ce59e289026ef1c9d8e0", + "sha256": "sha256-lOM2rA7O/ZxEeFe2qssciBOHtKpdhAufNgEYhC6wQaU=" + }, + "aaptcompiler-7.2.2.jar": { + "sha1": "9fd19b8406ca9efc017632e249ed71bf115c91ce", + "sha256": "sha256-JwiygNACLSCMNv3j/DFLUyvDwFDPsucvnQRZB0ibV4o=" + } + } + }, + { "path": "com/android/tools/build/aaptcompiler/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -3359,6 +3524,21 @@ } }, + { + "path": "com/android/tools/build/apksig/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "apksig-7.2.2.pom": { + "sha1": "f93b46d9c667bb19218bacbf1f417aea1b2c80a7", + "sha256": "sha256-0KxlJDZz84EFASSh7UsP7BEvu/gMMrZOshy2JurmWAc=" + }, + "apksig-7.2.2.jar": { + "sha1": "735df93a1e8f80050ce1e23caf72edd493273970", + "sha256": "sha256-QXvkt71+lPAyc3fELkC87ZkyXK5gg0EBAZlgJ1dIoC8=" + } + } + }, + { "path": "com/android/tools/build/apksig/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -3464,6 +3644,21 @@ } }, + { + "path": "com/android/tools/build/apkzlib/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "apkzlib-7.2.2.pom": { + "sha1": "a8d1a713ae07706102d594cd2d9adb33629170a9", + "sha256": "sha256-xZIhslBBDcsdOYyOC5DKTvPvIGodivUyoFKDuIkNBUI=" + }, + "apkzlib-7.2.2.jar": { + "sha1": "dea3c50cf709649fccb03ed2f936901e7b8d1c8f", + "sha256": "sha256-xwXYBhsE6RTPdabSie4ETolcsf0qXJrzQ7yMEZrKbeI=" + } + } + }, + { "path": "com/android/tools/build/apkzlib/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -3599,6 +3794,21 @@ } }, + { + "path": "com/android/tools/build/builder-model/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "builder-model-7.2.2.pom": { + "sha1": "3756a90e2a04c15443f3f6adac160ebce5f866f4", + "sha256": "sha256-1++OWSVrK+fGaf90i4Qbes2eHwyfWE4+ieO4rcRx/gk=" + }, + "builder-model-7.2.2.jar": { + "sha1": "4a03ee626adf07c3fdac9e5fd03d43ecb0d53da7", + "sha256": "sha256-ICKm7v8MYfM4KKtobc6Ue2ONBElZAkNsAh+1s7t+Yzg=" + } + } + }, + { "path": "com/android/tools/build/builder-model/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -3734,6 +3944,21 @@ } }, + { + "path": "com/android/tools/build/builder-test-api/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "builder-test-api-7.2.2.pom": { + "sha1": "f7f968c35dcc84791e9bda0a1df51a59661098d6", + "sha256": "sha256-xqCmnL6rBq/MvveEOSTINuX3hSE/fthmsUqM0d3WcVY=" + }, + "builder-test-api-7.2.2.jar": { + "sha1": "ce480e37559e82c850069cdd1759b18d8cc6360f", + "sha256": "sha256-Zm7w4xeI34oA7sKm1Ll4piabcLPqoiXqe6K/cmh7dOk=" + } + } + }, + { "path": "com/android/tools/build/builder-test-api/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -3869,6 +4094,21 @@ } }, + { + "path": "com/android/tools/build/builder/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "builder-7.2.2.pom": { + "sha1": "7751a6c936d55d187a4532c54cc7908574c6f5af", + "sha256": "sha256-5GJecjbtutcvetKb1wyj2tthxOsiNsjXgY+t2KpyA5A=" + }, + "builder-7.2.2.jar": { + "sha1": "45bab7da1d5a144bb0a401d3d92dc91ee5e089d4", + "sha256": "sha256-9MGubbKqSy3AIdtWWccfavgRV6KXWlnaeOgRuLUJ8a8=" + } + } + }, + { "path": "com/android/tools/build/builder/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -4109,6 +4349,21 @@ } }, + { + "path": "com/android/tools/build/gradle-api/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "gradle-api-7.2.2.pom": { + "sha1": "a0ec9997a888313d5689a82fa61b4edf8754d8f5", + "sha256": "sha256-DOEW14Yo9FKLRskvIFrfoRg7nJE1SLzqAUQYu/LxObk=" + }, + "gradle-api-7.2.2.jar": { + "sha1": "ff773057b490c477db4e46adb8f002dff1bf0c9f", + "sha256": "sha256-lOW3hudOcxoj0iHxCSkqncvz2MpdSnzyBltBh1muEQ0=" + } + } + }, + { "path": "com/android/tools/build/gradle-api/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -4274,6 +4529,21 @@ } }, + { + "path": "com/android/tools/build/gradle/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "gradle-7.2.2.pom": { + "sha1": "73dea6d4a00559898e24335f9f12e7a64912ce35", + "sha256": "sha256-VzQeQzn9pwnfDRpvLTIenfUx34CxH+dehOVRUsNRgkA=" + }, + "gradle-7.2.2.jar": { + "sha1": "50b664cc081b526c2a2c771626ed7e89806b63d1", + "sha256": "sha256-tPU9OjygjYJuX5iw3nDZBLCQfdas+osApmbVBEzoazw=" + } + } + }, + { "path": "com/android/tools/build/gradle/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -4559,6 +4829,21 @@ } }, + { + "path": "com/android/tools/build/manifest-merger/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "manifest-merger-30.2.2.pom": { + "sha1": "01c34d735c5de6a293f75d89b9865ef9dc8eb44a", + "sha256": "sha256-2pTtWPlHGgGZTy2VPc/1552OrW7Rc1iM3H4lW/swlfg=" + }, + "manifest-merger-30.2.2.jar": { + "sha1": "a67b1fd0f1e142d9f84af1923aa812f104bfb014", + "sha256": "sha256-RRi6QrGJCs3+xBz36jAhIELzO762gvYqoL4GFItp7t4=" + } + } + }, + { "path": "com/android/tools/build/manifest-merger/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -4694,6 +4979,21 @@ } }, + { + "path": "com/android/tools/common/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "common-30.2.2.pom": { + "sha1": "9f53a411990825cd50a174fa9cc2f123610f14b5", + "sha256": "sha256-BkRgZm2gd30menPKOQDtlCcdTzjciPnBNRvDkaEEdwU=" + }, + "common-30.2.2.jar": { + "sha1": "740a2343102f7ee6cd5a24361c4e6a26a5552260", + "sha256": "sha256-uld0saBPwR4tw2PtLicBPtfL6r5pbTvaujZinJltPVM=" + } + } + }, + { "path": "com/android/tools/common/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -4829,6 +5129,21 @@ } }, + { + "path": "com/android/tools/ddms/ddmlib/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "ddmlib-30.2.2.pom": { + "sha1": "1374a9bd4b335efeb859a304be4b05b1c0e9cd6d", + "sha256": "sha256-c7BL3r66SwLcrfTab//llubU9Otd+WIGWdbh1JejpVQ=" + }, + "ddmlib-30.2.2.jar": { + "sha1": "14cd6bdb1297977d779dc87a8cee074f2816b694", + "sha256": "sha256-h1uZAyeBITBymEdtz7L5lhMjQQ3RzduTcOWnVdBgk9Y=" + } + } + }, + { "path": "com/android/tools/ddms/ddmlib/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -4964,6 +5279,21 @@ } }, + { + "path": "com/android/tools/dvlib/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "dvlib-30.2.2.pom": { + "sha1": "505aaf5d11b5f67361adf6d72a7ccf31c0855e4d", + "sha256": "sha256-9C/V19pjsagpX5Af9erJ63K5NuTZm/3B0NNOPrXpUhY=" + }, + "dvlib-30.2.2.jar": { + "sha1": "957cccd8d81c52fb48d30226233a2d6dd01348a0", + "sha256": "sha256-jx+gFLcLqsf8QBnXt4goDautztdHzvQeUvTQxgPn4Lg=" + } + } + }, + { "path": "com/android/tools/dvlib/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -5010,31 +5340,31 @@ }, { - "path": "com/android/tools/external/com-intellij/intellij-core/30.3.0", + "path": "com/android/tools/external/com-intellij/intellij-core/30.2.2", "repo": "https://dl.google.com/dl/android/maven2", "files": { - "intellij-core-30.3.0.pom": { - "sha1": "4ccb0f7977bdfd29589579e1ae66a8acbf6bf217", - "sha256": "sha256-sDeu2in250vO7TWqPLFddmbqrauExhA11q/mVjPnAvk=" + "intellij-core-30.2.2.pom": { + "sha1": "34fded4377327c4ac6b36364df9f9dc8b347e178", + "sha256": "sha256-8LshxzX/G0InNezOPKDatR9521V1Xs1VH2qAIh/g+yo=" }, - "intellij-core-30.3.0.jar": { - "sha1": "7756210606d11ce9a9e8c628de79c4bbbea2d6fe", - "sha256": "sha256-i7Kuz7jdIgj+NBpzGsRKnsg/mJwSRJuC3/HqtJPeBAg=" + "intellij-core-30.2.2.jar": { + "sha1": "4bb803365992984ad80d65a41e8d075736368403", + "sha256": "sha256-zeyZX1waiDm5lhiPqOAhKzAwIaSNTu2WWfy1p9+So2Q=" } } }, { - "path": "com/android/tools/external/com-intellij/kotlin-compiler/30.3.0", + "path": "com/android/tools/external/com-intellij/kotlin-compiler/30.2.2", "repo": "https://dl.google.com/dl/android/maven2", "files": { - "kotlin-compiler-30.3.0.pom": { - "sha1": "0ce9cd688e705554ab28fee9b9eb1dc632bd6928", - "sha256": "sha256-/ll2LJVu/J1HSVh8uSc9B2F5WxKjoy4/kPKCAF7UUaA=" + "kotlin-compiler-30.2.2.pom": { + "sha1": "05f63387432b59aaf79e438142870f5b64625f35", + "sha256": "sha256-MuGGvhEycoth2RCVuSlI5pvA7TqHDm78kHs+/vHCc4M=" }, - "kotlin-compiler-30.3.0.jar": { - "sha1": "5d74e769b865cff40e7ecfb691782bbe21941a73", - "sha256": "sha256-zNyeGr+v3scfT5Ojoq1iMKE4SSWwb8J31O2SHeW7b9g=" + "kotlin-compiler-30.2.2.jar": { + "sha1": "8c6b8489940ab87971842e4052fbc310d4845e0d", + "sha256": "sha256-d+Ixka28fTI1ymlUAnHtsx8wqbyaHmpu8lXRpXellc4=" } } }, @@ -5070,16 +5400,16 @@ }, { - "path": "com/android/tools/external/org-jetbrains/uast/30.3.0", + "path": "com/android/tools/external/org-jetbrains/uast/30.2.2", "repo": "https://dl.google.com/dl/android/maven2", "files": { - "uast-30.3.0.pom": { - "sha1": "31125053651ad68f0bbdbbbda6eea8e123996d23", - "sha256": "sha256-vHlP3ZrMnehD2D8P285a5KUDyyTi0px2Rtb8GEbrh08=" + "uast-30.2.2.pom": { + "sha1": "ab89847e84d637946952ebefab68d3df2e1d77f2", + "sha256": "sha256-KW/UWsMrXFmFP4gA5lmVUaAMAmAEX9tHAoVuCdyCIAQ=" }, - "uast-30.3.0.jar": { - "sha1": "82347eff1a38a5f13919854f58ec0f13eeb92e19", - "sha256": "sha256-R78/wqapqgn3KHiOhpAzNBq9nYzbn8YQh9+3zVdgdtg=" + "uast-30.2.2.jar": { + "sha1": "c8ed9df6307deb6fc321e4f65f5b525766555f2f", + "sha256": "sha256-h49bBKs1UAdIgrFpjVhZaon74rQeD+wODD/WrribeQA=" } } }, @@ -5204,6 +5534,21 @@ } }, + { + "path": "com/android/tools/layoutlib/layoutlib-api/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "layoutlib-api-30.2.2.pom": { + "sha1": "1cb0874c381c037ef467df5a14171017f21b5491", + "sha256": "sha256-t5Vrdj0jn06BzAb3mgxdUWJRZLgru9rbAP6iCelFcx0=" + }, + "layoutlib-api-30.2.2.jar": { + "sha1": "f2b86f9214ba98e5b44a75b6863e8548885e3634", + "sha256": "sha256-LH15RbovjUpILY6KXpBpIzUCVfuLJ15dxv0KSm7gmrc=" + } + } + }, + { "path": "com/android/tools/layoutlib/layoutlib-api/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -5250,16 +5595,16 @@ }, { - "path": "com/android/tools/lint/lint-api/30.3.0", + "path": "com/android/tools/lint/lint-api/30.2.2", "repo": "https://dl.google.com/dl/android/maven2", "files": { - "lint-api-30.3.0.pom": { - "sha1": "d78a9e2f979f905aa11994d5a9ee7788fa3f4777", - "sha256": "sha256-Y6B0oc32on3t0pg0Y5ahRH829e+8zWQb/TfAIMwKDCU=" + "lint-api-30.2.2.pom": { + "sha1": "aae04c29cadcb2d273b3dbabcc8c1bcfd0acacc6", + "sha256": "sha256-ZtWv+YwUeaeAmRc7C4sIj6u8XhAwyc7ZfxOhBbHTbt4=" }, - "lint-api-30.3.0.jar": { - "sha1": "b6f7f7e9453b4a62fcd49d60c56076a3236d3748", - "sha256": "sha256-zG69ehRiJjY6o4u7ShDT4ykHmsMgHb/rViYFvmkdSCw=" + "lint-api-30.2.2.jar": { + "sha1": "d12887ce0fc33c82910b80d4b5a70b40888027e6", + "sha256": "sha256-fHbLIWYmYPp//nmvxEtZvxPsLPXmQNQOLC0+WisM1Mk=" } } }, @@ -5295,16 +5640,16 @@ }, { - "path": "com/android/tools/lint/lint-checks/30.3.0", + "path": "com/android/tools/lint/lint-checks/30.2.2", "repo": "https://dl.google.com/dl/android/maven2", "files": { - "lint-checks-30.3.0.pom": { - "sha1": "16652b8223ec83e3142d072a5f8a8ec167fc5f73", - "sha256": "sha256-F37xlLsakLbuOnZSSuOrabYVaCxSoY5nUoo1INI3Zvo=" + "lint-checks-30.2.2.pom": { + "sha1": "52cc32b1df2b4dba4bd988757948f5bf7adef1c6", + "sha256": "sha256-2pY8i/rJHozuc/Z1zoh0frABwO3DX/Xf/jsJNsZAySM=" }, - "lint-checks-30.3.0.jar": { - "sha1": "3de62d61661ad665e8561a1186654889fc4cdda8", - "sha256": "sha256-pqcovma04cthMz939Rn4ITRQmJvg++El/3fmJB0Hvo4=" + "lint-checks-30.2.2.jar": { + "sha1": "2081015210a3bad91d70eeaf2c5a9076662f1ace", + "sha256": "sha256-xQl1/th02S2V5IEj62glHOUVX4lC9i7m53I4hGTCpNU=" } } }, @@ -5370,16 +5715,16 @@ }, { - "path": "com/android/tools/lint/lint-gradle/30.3.0", + "path": "com/android/tools/lint/lint-gradle/30.2.2", "repo": "https://dl.google.com/dl/android/maven2", "files": { - "lint-gradle-30.3.0.pom": { - "sha1": "07a1f9bdc71ba0bc3a688d4dbea9db63e396e9d7", - "sha256": "sha256-WP0EfLZn0TwXJHkfTx4xzQ/GNhkFatzl4glqdvinMmE=" + "lint-gradle-30.2.2.pom": { + "sha1": "4c61f742d4eb877317378292f51a7ebd2dd31bcf", + "sha256": "sha256-r5mGndv09Kkg09UjpHcOpLe34oJCfyjUZtgdDIGMP3k=" }, - "lint-gradle-30.3.0.jar": { - "sha1": "db2f578c8c1dbf3be7888fb5f923fae7db1fdcb7", - "sha256": "sha256-MxxKwXacJr+QZX2yGdzGOcpj/i+66dsf9nTdCmLHRnY=" + "lint-gradle-30.2.2.jar": { + "sha1": "82bfb51709e32da7bebdd4d80f73f0a8acb842a0", + "sha256": "sha256-E9PV6E60SdaopN75vaZ068wO5LJzJ/qFVfr6GBvfeHU=" } } }, @@ -5429,6 +5774,21 @@ } }, + { + "path": "com/android/tools/lint/lint-model/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "lint-model-30.2.2.pom": { + "sha1": "095c6134a0494bfd49c5c970141dd713dadbdbba", + "sha256": "sha256-m9c1XvF5vWGtKvW2jDBPoKJg9uDLBuK+gTovG8vPZEY=" + }, + "lint-model-30.2.2.jar": { + "sha1": "ccf956e3391a66eea697a076655f138be0e9b0a6", + "sha256": "sha256-t+mI3xLWJB6PBvTTU3kNAeJo6VWyt7NShtD6UjPooEU=" + } + } + }, + { "path": "com/android/tools/lint/lint-model/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -5459,6 +5819,21 @@ } }, + { + "path": "com/android/tools/lint/lint-typedef-remover/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "lint-typedef-remover-30.2.2.pom": { + "sha1": "0feb02247cd41ed17042756af049274698d1e21d", + "sha256": "sha256-6fIrVSDr8tuGBKd08Sq6WD1zdNgSVhPlz+lh82L7Wgg=" + }, + "lint-typedef-remover-30.2.2.jar": { + "sha1": "58f701ab23acf04b423b7553fc4f4f8b8b824367", + "sha256": "sha256-9oVJBc/VbEUl6wIvwRZIBU76gS+hYVlkqOyMEXrzksY=" + } + } + }, + { "path": "com/android/tools/lint/lint-typedef-remover/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -5505,16 +5880,16 @@ }, { - "path": "com/android/tools/lint/lint/30.3.0", + "path": "com/android/tools/lint/lint/30.2.2", "repo": "https://dl.google.com/dl/android/maven2", "files": { - "lint-30.3.0.pom": { - "sha1": "113b4d35dd98e3fd22316d3a9b3ac6f22eb88662", - "sha256": "sha256-i/VJkzTvMA/2D1TYrmee65KS2wE6i7yrS1eCAx0qqx8=" + "lint-30.2.2.pom": { + "sha1": "3487e4b30a5d7ac76f6ac2ade3cda0c809b239c2", + "sha256": "sha256-6SHwscNJc6P4zltslkHF1x2TDAQAzniCDM3MdiSbX/Y=" }, - "lint-30.3.0.jar": { - "sha1": "e84f007751bfbc68dad10bbc79ecb9cc484c6e5b", - "sha256": "sha256-aFCAeC9jaMxorHTbBltMXFnZyCWZ3DS+LsOeQlJRuGQ=" + "lint-30.2.2.jar": { + "sha1": "f9f9690f108fedcadf1b767499a64a22b4cd3485", + "sha256": "sha256-AoLdGDG8RJtjXJjCpQYFcqQ2ZoXjSylVuLKrJxxeNXA=" } } }, @@ -5639,6 +6014,21 @@ } }, + { + "path": "com/android/tools/repository/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "repository-30.2.2.pom": { + "sha1": "75bcc78020c4fed4d9d1f0125c6f89417b10e999", + "sha256": "sha256-kXhGzJxl19bX/ATI3nBE0Pys4pe+z5HWG0CjGTAft6c=" + }, + "repository-30.2.2.jar": { + "sha1": "19678ceb38d2bbcfe52fb4721e839948832f8927", + "sha256": "sha256-kLvM3RfJXQy2Z3EQLXUPFZsD+Ls22N3vmc3R4DhkscY=" + } + } + }, + { "path": "com/android/tools/repository/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -5774,6 +6164,21 @@ } }, + { + "path": "com/android/tools/sdklib/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "sdklib-30.2.2.pom": { + "sha1": "2bd7da9c14e652f5850177c4e45f6241a2c4c162", + "sha256": "sha256-x9sUqUiFlpU/I2iZ5rIb//MwnpbTOeYFcDxjfkntMhk=" + }, + "sdklib-30.2.2.jar": { + "sha1": "a96285f990a3ef4e4931f79f811dc3bebb8e9ebe", + "sha256": "sha256-aiBVKeB8eDHStgu/xWuCwONUyGKPWhEb/7fF8rkwoRw=" + } + } + }, + { "path": "com/android/tools/sdklib/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -5909,6 +6314,21 @@ } }, + { + "path": "com/android/tools/sdk-common/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "sdk-common-30.2.2.pom": { + "sha1": "55d1dff2674abe92f1a4e67cc3bbd8f5e847d5bd", + "sha256": "sha256-X9YSFjay8BLctShF94WIVsiWMdP7GEUHAWTM4SdKzm4=" + }, + "sdk-common-30.2.2.jar": { + "sha1": "64bf976b32568fb2639b61d9d817238325f2ce88", + "sha256": "sha256-+VyeHJ94004yYpQIZG68TH8xNCQunvprrxbBPLW9Q9M=" + } + } + }, + { "path": "com/android/tools/sdk-common/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -5939,6 +6359,21 @@ } }, + { + "path": "com/android/tools/utp/android-device-provider-ddmlib-proto/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "android-device-provider-ddmlib-proto-30.2.2.pom": { + "sha1": "c29f26672cfd6ad1640743d20f4c7cfe667ae96c", + "sha256": "sha256-uZkz3vCkvTcZJL3srfyr9vI3prVscJvdPUXbWAddpTw=" + }, + "android-device-provider-ddmlib-proto-30.2.2.jar": { + "sha1": "0f826f220511bb2b3189d3c5c97f0362f6b7ef6b", + "sha256": "sha256-IvDFhxb3S8GrDwnbcBeykSJf2s1yntnCiKMFYGGTbdI=" + } + } + }, + { "path": "com/android/tools/utp/android-device-provider-ddmlib-proto/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -5984,6 +6419,21 @@ } }, + { + "path": "com/android/tools/utp/android-device-provider-gradle-proto/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "android-device-provider-gradle-proto-30.2.2.pom": { + "sha1": "369adb7d052bd3eeb6cbc0435e87add3faed09b0", + "sha256": "sha256-8zxh2hLivrLbxqCmp46h1b+IwkMVPV/pobxBjp4+TgU=" + }, + "android-device-provider-gradle-proto-30.2.2.jar": { + "sha1": "f388ff4323a3ca9331c44b57f6d79c7888eafb3a", + "sha256": "sha256-2oL1qzkX+U4VscIywIm4C9MDBIfUhD0G0b8lxmcWmFc=" + } + } + }, + { "path": "com/android/tools/utp/android-device-provider-gradle-proto/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -6014,6 +6464,21 @@ } }, + { + "path": "com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "android-test-plugin-host-additional-test-output-proto-30.2.2.pom": { + "sha1": "7c860d790101cf01157d7690fba0b08195eef051", + "sha256": "sha256-fZGBiDIUoAcUE2aXUcf0/y6su7o5vEWZ4/raC+AsEw4=" + }, + "android-test-plugin-host-additional-test-output-proto-30.2.2.jar": { + "sha1": "f061caeed16aa51b30d80d4c46231f5ccda5820b", + "sha256": "sha256-xoQzBjz4Nyw8SUwdbZgryGkCtYGQTnv3n8K/1lhSDdg=" + } + } + }, + { "path": "com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -6044,6 +6509,21 @@ } }, + { + "path": "com/android/tools/utp/android-test-plugin-host-coverage-proto/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "android-test-plugin-host-coverage-proto-30.2.2.pom": { + "sha1": "c56ddd9fbde65e5bde87a1d12c210864cda2b25f", + "sha256": "sha256-58lRN6iju0KB+70MyHP7g85Lst0KxWIcUu8zLEXCwQI=" + }, + "android-test-plugin-host-coverage-proto-30.2.2.jar": { + "sha1": "b58f7510d5da7fe2889c93b04ff3cbe65716a355", + "sha256": "sha256-ANqzP5saoTy2VKRb9HNjoVf5CkP1SrPl3Qqkoh0xINg=" + } + } + }, + { "path": "com/android/tools/utp/android-test-plugin-host-coverage-proto/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -6089,6 +6569,21 @@ } }, + { + "path": "com/android/tools/utp/android-test-plugin-host-retention-proto/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "android-test-plugin-host-retention-proto-30.2.2.pom": { + "sha1": "c2c71e2f5bc83be382d2c45ab59b860467c883a3", + "sha256": "sha256-i4fucI1Uxo7mIMN5XACw3ChGW4DJpaeteiy6AQxoFco=" + }, + "android-test-plugin-host-retention-proto-30.2.2.jar": { + "sha1": "98a4586c90912f95aee51ab75bcf43e5bc7a8764", + "sha256": "sha256-Pgkl6YT/PGHQ9ddvuN1S6bdxfqqICArQ7pP/PuOMIkY=" + } + } + }, + { "path": "com/android/tools/utp/android-test-plugin-host-retention-proto/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -6134,6 +6629,21 @@ } }, + { + "path": "com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "android-test-plugin-result-listener-gradle-proto-30.2.2.pom": { + "sha1": "c574f8b3b29d16b1bb3a24f7d2fa20a54d7ae9ec", + "sha256": "sha256-2t9xwOyLB8sGVAQxx/OE0Hi9UZVjlylLhl8kS7kVTUM=" + }, + "android-test-plugin-result-listener-gradle-proto-30.2.2.jar": { + "sha1": "ac5e696b0f3e3036962b43b38a17a7a325be5306", + "sha256": "sha256-imNHBSCcUAThTVe3LXnHGgQv4OlxTwwLZ9KIKNr3Jdg=" + } + } + }, + { "path": "com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.3.0", "repo": "https://dl.google.com/dl/android/maven2", @@ -6194,6 +6704,21 @@ } }, + { + "path": "com/android/zipflinger/7.2.2", + "repo": "https://dl.google.com/dl/android/maven2", + "files": { + "zipflinger-7.2.2.pom": { + "sha1": "cacce1fc54bfc02f378aa8d6d2c2577830575fe5", + "sha256": "sha256-cbuMVa9UqnetOXFBSfFHtEwlxhuDZ8+YZMlZxGWbUUQ=" + }, + "zipflinger-7.2.2.jar": { + "sha1": "3a0ab31aa56c06b9839bc081b30a2c8c6e6a89ac", + "sha256": "sha256-ByB/Fh6TbNlyQy1KCfN4g2twHkncMBYun1HEH4dV0ow=" + } + } + }, + { "path": "com/android/zipflinger/7.3.0", "repo": "https://dl.google.com/dl/android/maven2", diff --git a/nix/deps/gradle/deps.list b/nix/deps/gradle/deps.list index 76bd5f0d3aea..2286f059fb1e 100644 --- a/nix/deps/gradle/deps.list +++ b/nix/deps/gradle/deps.list @@ -36,12 +36,14 @@ androidx.databinding:databinding-common:3.3.1 androidx.databinding:databinding-common:3.5.4 androidx.databinding:databinding-common:4.1.0 androidx.databinding:databinding-common:7.2.1 +androidx.databinding:databinding-common:7.2.2 androidx.databinding:databinding-common:7.3.0 androidx.databinding:databinding-compiler-common:3.2.1 androidx.databinding:databinding-compiler-common:3.3.1 androidx.databinding:databinding-compiler-common:3.5.4 androidx.databinding:databinding-compiler-common:4.1.0 androidx.databinding:databinding-compiler-common:7.2.1 +androidx.databinding:databinding-compiler-common:7.2.2 androidx.databinding:databinding-compiler-common:7.3.0 androidx.documentfile:documentfile:1.0.0 androidx.drawerlayout:drawerlayout:1.0.0 @@ -116,6 +118,7 @@ com.android.databinding:baseLibrary:3.3.1 com.android.databinding:baseLibrary:3.5.4 com.android.databinding:baseLibrary:4.1.0 com.android.databinding:baseLibrary:7.2.1 +com.android.databinding:baseLibrary:7.2.2 com.android.databinding:baseLibrary:7.3.0 com.android.databinding:compilerCommon:1.0-rc5 com.android.databinding:compilerCommon:3.0.0 @@ -125,6 +128,7 @@ com.android.tools.analytics-library:crash:26.3.1 com.android.tools.analytics-library:crash:26.5.4 com.android.tools.analytics-library:crash:27.1.0 com.android.tools.analytics-library:crash:30.2.1 +com.android.tools.analytics-library:crash:30.2.2 com.android.tools.analytics-library:crash:30.3.0 com.android.tools.analytics-library:protos:26.0.0 com.android.tools.analytics-library:protos:26.0.1 @@ -133,6 +137,7 @@ com.android.tools.analytics-library:protos:26.3.1 com.android.tools.analytics-library:protos:26.5.4 com.android.tools.analytics-library:protos:27.1.0 com.android.tools.analytics-library:protos:30.2.1 +com.android.tools.analytics-library:protos:30.2.2 com.android.tools.analytics-library:protos:30.3.0 com.android.tools.analytics-library:shared:26.0.0 com.android.tools.analytics-library:shared:26.0.1 @@ -141,6 +146,7 @@ com.android.tools.analytics-library:shared:26.3.1 com.android.tools.analytics-library:shared:26.5.4 com.android.tools.analytics-library:shared:27.1.0 com.android.tools.analytics-library:shared:30.2.1 +com.android.tools.analytics-library:shared:30.2.2 com.android.tools.analytics-library:shared:30.3.0 com.android.tools.analytics-library:tracker:26.0.0 com.android.tools.analytics-library:tracker:26.0.1 @@ -149,6 +155,7 @@ com.android.tools.analytics-library:tracker:26.3.1 com.android.tools.analytics-library:tracker:26.5.4 com.android.tools.analytics-library:tracker:27.1.0 com.android.tools.analytics-library:tracker:30.2.1 +com.android.tools.analytics-library:tracker:30.2.2 com.android.tools.analytics-library:tracker:30.3.0 com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta02 @@ -164,9 +171,11 @@ com.android.tools.build:aapt2-proto:0.3.1 com.android.tools.build:aapt2-proto:0.4.0 com.android.tools.build:aapt2-proto:4.1.0-6503028 com.android.tools.build:aapt2-proto:7.2.1-7984345 +com.android.tools.build:aapt2-proto:7.2.2-7984345 com.android.tools.build:aapt2-proto:7.3.0-8691043 com.android.tools.build:aaptcompiler:4.1.0 com.android.tools.build:aaptcompiler:7.2.1 +com.android.tools.build:aaptcompiler:7.2.2 com.android.tools.build:aaptcompiler:7.3.0 com.android.tools.build:apksig:3.0.0 com.android.tools.build:apksig:3.0.1 @@ -175,12 +184,14 @@ com.android.tools.build:apksig:3.3.1 com.android.tools.build:apksig:3.5.4 com.android.tools.build:apksig:4.1.0 com.android.tools.build:apksig:7.2.1 +com.android.tools.build:apksig:7.2.2 com.android.tools.build:apksig:7.3.0 com.android.tools.build:apkzlib:3.2.1 com.android.tools.build:apkzlib:3.3.1 com.android.tools.build:apkzlib:3.5.4 com.android.tools.build:apkzlib:4.1.0 com.android.tools.build:apkzlib:7.2.1 +com.android.tools.build:apkzlib:7.2.2 com.android.tools.build:apkzlib:7.3.0 com.android.tools.build:builder-model:1.1.3 com.android.tools.build:builder-model:1.3.1 @@ -192,6 +203,7 @@ com.android.tools.build:builder-model:3.3.1 com.android.tools.build:builder-model:3.5.4 com.android.tools.build:builder-model:4.1.0 com.android.tools.build:builder-model:7.2.1 +com.android.tools.build:builder-model:7.2.2 com.android.tools.build:builder-model:7.3.0 com.android.tools.build:builder-test-api:1.1.3 com.android.tools.build:builder-test-api:1.3.1 @@ -203,6 +215,7 @@ com.android.tools.build:builder-test-api:3.3.1 com.android.tools.build:builder-test-api:3.5.4 com.android.tools.build:builder-test-api:4.1.0 com.android.tools.build:builder-test-api:7.2.1 +com.android.tools.build:builder-test-api:7.2.2 com.android.tools.build:builder-test-api:7.3.0 com.android.tools.build:builder:1.1.3 com.android.tools.build:builder:1.3.1 @@ -214,6 +227,7 @@ com.android.tools.build:builder:3.3.1 com.android.tools.build:builder:3.5.4 com.android.tools.build:builder:4.1.0 com.android.tools.build:builder:7.2.1 +com.android.tools.build:builder:7.2.2 com.android.tools.build:builder:7.3.0 com.android.tools.build:bundletool:0.5.0 com.android.tools.build:bundletool:0.6.0 @@ -228,6 +242,7 @@ com.android.tools.build:gradle-api:3.3.1 com.android.tools.build:gradle-api:3.5.4 com.android.tools.build:gradle-api:4.1.0 com.android.tools.build:gradle-api:7.2.1 +com.android.tools.build:gradle-api:7.2.2 com.android.tools.build:gradle-api:7.3.0 com.android.tools.build:gradle-core:1.1.3 com.android.tools.build:gradle-core:1.3.1 @@ -244,6 +259,7 @@ com.android.tools.build:gradle:3.3.1 com.android.tools.build:gradle:3.5.4 com.android.tools.build:gradle:4.1.0 com.android.tools.build:gradle:7.2.1 +com.android.tools.build:gradle:7.2.2 com.android.tools.build:gradle:7.3.0 com.android.tools.build:manifest-merger:24.1.3 com.android.tools.build:manifest-merger:24.3.1 @@ -255,6 +271,7 @@ com.android.tools.build:manifest-merger:26.3.1 com.android.tools.build:manifest-merger:26.5.4 com.android.tools.build:manifest-merger:27.1.0 com.android.tools.build:manifest-merger:30.2.1 +com.android.tools.build:manifest-merger:30.2.2 com.android.tools.build:manifest-merger:30.3.0 com.android.tools.build:transform-api:1.5.0 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api @@ -268,6 +285,7 @@ com.android.tools.ddms:ddmlib:26.3.1 com.android.tools.ddms:ddmlib:26.5.4 com.android.tools.ddms:ddmlib:27.1.0 com.android.tools.ddms:ddmlib:30.2.1 +com.android.tools.ddms:ddmlib:30.2.2 com.android.tools.ddms:ddmlib:30.3.0 com.android.tools.external.com-intellij:intellij-core:26.0.0 com.android.tools.external.com-intellij:intellij-core:26.0.1 @@ -286,6 +304,7 @@ com.android.tools.layoutlib:layoutlib-api:26.3.1 com.android.tools.layoutlib:layoutlib-api:26.5.4 com.android.tools.layoutlib:layoutlib-api:27.1.0 com.android.tools.layoutlib:layoutlib-api:30.2.1 +com.android.tools.layoutlib:layoutlib-api:30.2.2 com.android.tools.layoutlib:layoutlib-api:30.3.0 com.android.tools.lint:lint-api:24.1.3 com.android.tools.lint:lint-api:24.3.1 @@ -303,8 +322,10 @@ com.android.tools.lint:lint-gradle-api:26.5.4 com.android.tools.lint:lint-gradle-api:27.1.0 com.android.tools.lint:lint-model:27.1.0 com.android.tools.lint:lint-model:30.2.1 +com.android.tools.lint:lint-model:30.2.2 com.android.tools.lint:lint-model:30.3.0 com.android.tools.lint:lint-typedef-remover:30.2.1 +com.android.tools.lint:lint-typedef-remover:30.2.2 com.android.tools.lint:lint-typedef-remover:30.3.0 com.android.tools.lint:lint:24.1.3 com.android.tools.lint:lint:24.3.1 @@ -312,16 +333,22 @@ com.android.tools.lint:lint:24.5.0 com.android.tools.lint:lint:26.0.0 com.android.tools.lint:lint:26.0.1 com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.1 +com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.2 com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0 com.android.tools.utp:android-device-provider-gradle-proto:30.2.1 +com.android.tools.utp:android-device-provider-gradle-proto:30.2.2 com.android.tools.utp:android-device-provider-gradle-proto:30.3.0 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.1 +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.2 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.1 +com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.2 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0 com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.1 +com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.2 com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.1 +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.2 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0 com.android.tools:annotations:24.1.3 com.android.tools:annotations:24.3.1 @@ -333,6 +360,7 @@ com.android.tools:annotations:26.3.1 com.android.tools:annotations:26.5.4 com.android.tools:annotations:27.1.0 com.android.tools:annotations:30.2.1 +com.android.tools:annotations:30.2.2 com.android.tools:annotations:30.3.0 com.android.tools:common:24.1.3 com.android.tools:common:24.3.1 @@ -344,6 +372,7 @@ com.android.tools:common:26.3.1 com.android.tools:common:26.5.4 com.android.tools:common:27.1.0 com.android.tools:common:30.2.1 +com.android.tools:common:30.2.2 com.android.tools:common:30.3.0 com.android.tools:dvlib:24.1.3 com.android.tools:dvlib:24.3.1 @@ -355,6 +384,7 @@ com.android.tools:dvlib:26.3.1 com.android.tools:dvlib:26.5.4 com.android.tools:dvlib:27.1.0 com.android.tools:dvlib:30.2.1 +com.android.tools:dvlib:30.2.2 com.android.tools:dvlib:30.3.0 com.android.tools:repository:26.0.0 com.android.tools:repository:26.0.1 @@ -363,6 +393,7 @@ com.android.tools:repository:26.3.1 com.android.tools:repository:26.5.4 com.android.tools:repository:27.1.0 com.android.tools:repository:30.2.1 +com.android.tools:repository:30.2.2 com.android.tools:repository:30.3.0 com.android.tools:sdklib:24.1.3 com.android.tools:sdklib:24.3.1 @@ -374,6 +405,7 @@ com.android.tools:sdklib:26.3.1 com.android.tools:sdklib:26.5.4 com.android.tools:sdklib:27.1.0 com.android.tools:sdklib:30.2.1 +com.android.tools:sdklib:30.2.2 com.android.tools:sdklib:30.3.0 com.android.tools:sdk-common:24.1.3 com.android.tools:sdk-common:24.3.1 @@ -385,12 +417,15 @@ com.android.tools:sdk-common:26.3.1 com.android.tools:sdk-common:26.5.4 com.android.tools:sdk-common:27.1.0 com.android.tools:sdk-common:30.2.1 +com.android.tools:sdk-common:30.2.2 com.android.tools:sdk-common:30.3.0 com.android:signflinger:4.1.0 com.android:signflinger:7.2.1 +com.android:signflinger:7.2.2 com.android:signflinger:7.3.0 com.android:zipflinger:4.1.0 com.android:zipflinger:7.2.1 +com.android:zipflinger:7.2.2 com.android:zipflinger:7.3.0 com.diffplug.durian:durian-collect:1.2.0 com.diffplug.durian:durian-core:1.2.0 @@ -766,5 +801,5 @@ org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2 xerces:xercesImpl:2.12.0 xml-apis:xml-apis:1.4.01 org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10 -com.android.tools.lint:lint-gradle:30.3.0 +com.android.tools.lint:lint-gradle:30.2.2 com.android.tools.build:gradle:7.0.4 diff --git a/nix/deps/gradle/deps.urls b/nix/deps/gradle/deps.urls index 8410203ed606..0b64ba2d8ff3 100644 --- a/nix/deps/gradle/deps.urls +++ b/nix/deps/gradle/deps.urls @@ -53,6 +53,7 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/4.1.0/databinding-common-4.1.0.pom https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.0.4/databinding-common-7.0.4.pom https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.2.1/databinding-common-7.2.1.pom +https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.2.2/databinding-common-7.2.2.pom https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.3.0/databinding-common-7.3.0.pom https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.2.1/databinding-compiler-common-3.2.1.pom https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.3.1/databinding-compiler-common-3.3.1.pom @@ -60,6 +61,7 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compile https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/4.1.0/databinding-compiler-common-4.1.0.pom https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.0.4/databinding-compiler-common-7.0.4.pom https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.2.1/databinding-compiler-common-7.2.1.pom +https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.2.2/databinding-compiler-common-7.2.2.pom https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.3.0/databinding-compiler-common-7.3.0.pom https://dl.google.com/dl/android/maven2/androidx/documentfile/documentfile/1.0.0/documentfile-1.0.0.pom https://dl.google.com/dl/android/maven2/androidx/drawerlayout/drawerlayout/1.0.0/drawerlayout-1.0.0.pom @@ -132,12 +134,14 @@ https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5. https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.1.0/baseLibrary-4.1.0.pom https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.0.4/baseLibrary-7.0.4.pom https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.2.1/baseLibrary-7.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.2.2/baseLibrary-7.2.2.pom https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.3.0/baseLibrary-7.3.0.pom https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.0/compilerCommon-3.0.0.pom https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.1/compilerCommon-3.0.1.pom https://dl.google.com/dl/android/maven2/com/android/signflinger/4.1.0/signflinger-4.1.0.pom https://dl.google.com/dl/android/maven2/com/android/signflinger/7.0.4/signflinger-7.0.4.pom https://dl.google.com/dl/android/maven2/com/android/signflinger/7.2.1/signflinger-7.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/signflinger/7.2.2/signflinger-7.2.2.pom https://dl.google.com/dl/android/maven2/com/android/signflinger/7.3.0/signflinger-7.3.0.pom https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/26.0.2/animated-vector-drawable-26.0.2.pom https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/27.0.1/animated-vector-drawable-27.0.1.pom @@ -165,6 +169,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/cras https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/27.1.0/crash-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.0.4/crash-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.2.1/crash-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.2.2/crash-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.3.0/crash-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom @@ -174,6 +179,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/prot https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/27.1.0/protos-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.0.4/protos-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.2.1/protos-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.2.2/protos-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.3.0/protos-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom @@ -183,6 +189,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shar https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/27.1.0/shared-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.0.4/shared-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.2.1/shared-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.2.2/shared-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.3.0/shared-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom @@ -192,6 +199,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/trac https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/27.1.0/tracker-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.0.4/tracker-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.2.1/tracker-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.2.2/tracker-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.3.0/tracker-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.0/annotations-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom @@ -201,6 +209,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.4/ann https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.1.0/annotations-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.0.4/annotations-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.2.1/annotations-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.2.2/annotations-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.3.0/annotations-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.3.1/aapt2-proto-0.3.1.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.4.0/aapt2-proto-0.4.0.pom @@ -209,10 +218,12 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/4.1. https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.0.0-beta04-7396180/aapt2-proto-7.0.0-beta04-7396180.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.0.4-7396180/aapt2-proto-7.0.4-7396180.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.2.1-7984345/aapt2-proto-7.2.1-7984345.pom +https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.2.2-7984345/aapt2-proto-7.2.2-7984345.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.3.0-8691043/aapt2-proto-7.3.0-8691043.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/4.1.0/aaptcompiler-4.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.0.4/aaptcompiler-7.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.2.1/aaptcompiler-7.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.2.2/aaptcompiler-7.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.3.0/aaptcompiler-7.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.0/apksig-3.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom @@ -222,6 +233,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.4/apk https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/4.1.0/apksig-4.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.0.4/apksig-7.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.2.1/apksig-7.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.2.2/apksig-7.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.3.0/apksig-7.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.2.1/apkzlib-3.2.1.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.3.1/apkzlib-3.3.1.pom @@ -229,6 +241,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.4/ap https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.1.0/apkzlib-4.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.0.4/apkzlib-7.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.2.1/apkzlib-7.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.2.2/apkzlib-7.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.3.0/apkzlib-7.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom @@ -238,6 +251,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3. https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/4.1.0/builder-model-4.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.0.4/builder-model-7.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.2.1/builder-model-7.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.2.2/builder-model-7.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.3.0/builder-model-7.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom @@ -247,6 +261,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/4.1.0/builder-test-api-4.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.0.4/builder-test-api-7.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.2.1/builder-test-api-7.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.2.2/builder-test-api-7.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.3.0/builder-test-api-7.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.0/builder-3.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom @@ -256,6 +271,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.4/bu https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.1.0/builder-4.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.0.4/builder-7.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.2.1/builder-7.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.2.2/builder-7.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.3.0/builder-7.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.5.0/bundletool-0.5.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.6.0/bundletool-0.6.0.pom @@ -272,6 +288,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.4 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4.1.0/gradle-api-4.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.0.4/gradle-api-7.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.2.1/gradle-api-7.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.2.2/gradle-api-7.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.3.0/gradle-api-7.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.0/gradle-core-3.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.1/gradle-core-3.0.1.pom @@ -283,6 +300,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.4/gra https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/4.1.0/gradle-4.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.0.4/gradle-7.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.2.1/gradle-7.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.2.2/gradle-7.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.3.0/gradle-7.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-alpha10/jetifier-core-1.0.0-alpha10.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta02/jetifier-core-1.0.0-beta02.pom @@ -302,6 +320,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/ https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/27.1.0/manifest-merger-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.0.4/manifest-merger-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.2.1/manifest-merger-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.2.2/manifest-merger-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.3.0/manifest-merger-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.0/common-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom @@ -311,6 +330,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.4/common-2 https://dl.google.com/dl/android/maven2/com/android/tools/common/27.1.0/common-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/common/30.0.4/common-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/common/30.2.1/common-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/common/30.2.2/common-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/common/30.3.0/common-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom @@ -320,6 +340,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.4/ddm https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.1.0/ddmlib-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.0.4/ddmlib-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.2.1/ddmlib-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.2.2/ddmlib-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.3.0/ddmlib-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.0/dvlib-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom @@ -329,14 +350,15 @@ https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.4/dvlib-26. https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/27.1.0/dvlib-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.0.4/dvlib-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.2.1/dvlib-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.2.2/dvlib-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.3.0/dvlib-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.0/intellij-core-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.1/intellij-core-26.0.1.pom -https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/30.3.0/intellij-core-30.3.0.pom -https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/kotlin-compiler/30.3.0/kotlin-compiler-30.3.0.pom +https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/30.2.2/intellij-core-30.2.2.pom +https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/kotlin-compiler/30.2.2/kotlin-compiler-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.0/uast-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.1/uast-26.0.1.pom -https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/30.3.0/uast-30.3.0.pom +https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/30.2.2/uast-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom @@ -345,27 +367,30 @@ https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-ap https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/27.1.0/layoutlib-api-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.0.4/layoutlib-api-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.2.1/layoutlib-api-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.2.2/layoutlib-api-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.3.0/layoutlib-api-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.0/lint-api-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.1/lint-api-26.0.1.pom -https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/30.3.0/lint-api-30.3.0.pom +https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/30.2.2/lint-api-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom -https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/30.3.0/lint-checks-30.3.0.pom +https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/30.2.2/lint-checks-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.2.1/lint-gradle-api-26.2.1.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.3.1/lint-gradle-api-26.3.1.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.4/lint-gradle-api-26.5.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/27.1.0/lint-gradle-api-27.1.0.pom -https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/30.3.0/lint-gradle-30.3.0.pom +https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/30.2.2/lint-gradle-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/27.1.0/lint-model-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.0.4/lint-model-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.2.1/lint-model-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.2.2/lint-model-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.3.0/lint-model-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.2.1/lint-typedef-remover-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.2.2/lint-typedef-remover-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.3.0/lint-typedef-remover-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.0/lint-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-26.0.1.pom -https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/30.3.0/lint-30.3.0.pom +https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/30.2.2/lint-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.0/repository-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom @@ -374,6 +399,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.4/repo https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.1.0/repository-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.0.4/repository-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.2.1/repository-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.2.2/repository-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.3.0/repository-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.0/sdklib-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom @@ -383,6 +409,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.4/sdklib-2 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.1.0/sdklib-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.0.4/sdklib-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.2.1/sdklib-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.2.2/sdklib-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.3.0/sdklib-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom @@ -392,25 +419,33 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.4/sdk- https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/27.1.0/sdk-common-27.1.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.0.4/sdk-common-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.2.1/sdk-common-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.2.2/sdk-common-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.3.0/sdk-common-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.2.1/android-device-provider-ddmlib-proto-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.2.2/android-device-provider-ddmlib-proto-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.3.0/android-device-provider-ddmlib-proto-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.0.4/android-device-provider-gradle-proto-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.2.1/android-device-provider-gradle-proto-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.2.2/android-device-provider-gradle-proto-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.3.0/android-device-provider-gradle-proto-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.2.1/android-test-plugin-host-additional-test-output-proto-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.2.2/android-test-plugin-host-additional-test-output-proto-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.3.0/android-test-plugin-host-additional-test-output-proto-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.2.1/android-test-plugin-host-coverage-proto-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.2.2/android-test-plugin-host-coverage-proto-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.3.0/android-test-plugin-host-coverage-proto-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.0.4/android-test-plugin-host-retention-proto-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.2.1/android-test-plugin-host-retention-proto-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.2.2/android-test-plugin-host-retention-proto-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.3.0/android-test-plugin-host-retention-proto-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.0.4/android-test-plugin-result-listener-gradle-proto-30.0.4.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.2.1/android-test-plugin-result-listener-gradle-proto-30.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.2.2/android-test-plugin-result-listener-gradle-proto-30.2.2.pom https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.3.0/android-test-plugin-result-listener-gradle-proto-30.3.0.pom https://dl.google.com/dl/android/maven2/com/android/zipflinger/4.1.0/zipflinger-4.1.0.pom https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.0.4/zipflinger-7.0.4.pom https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.2.1/zipflinger-7.2.1.pom +https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.2.2/zipflinger-7.2.2.pom https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.3.0/zipflinger-7.3.0.pom https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0.0/material-1.0.0.pom https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.2.0-alpha03/material-1.2.0-alpha03.pom diff --git a/nix/deps/gradle/generate.sh b/nix/deps/gradle/generate.sh index 56663678b47a..bd24d616372e 100755 --- a/nix/deps/gradle/generate.sh +++ b/nix/deps/gradle/generate.sh @@ -85,7 +85,7 @@ gen_proj_list gen_deps_list # FIXME: Temporary fix for missing package. echo 'org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10' >> "${DEPS_LIST}" -echo 'com.android.tools.lint:lint-gradle:30.3.0' >> "${DEPS_LIST}" +echo 'com.android.tools.lint:lint-gradle:30.2.2' >> "${DEPS_LIST}" echo 'com.android.tools.build:gradle:7.0.4' >> "${DEPS_LIST}" gen_deps_urls gen_deps_json diff --git a/nix/pkgs/aapt2/default.nix b/nix/pkgs/aapt2/default.nix index 86d9a93eb919..e6a6f618cf6c 100644 --- a/nix/pkgs/aapt2/default.nix +++ b/nix/pkgs/aapt2/default.nix @@ -10,7 +10,7 @@ let pname = "aapt2"; # Warning: This must be the same as gradlePluginVersion android/gradle.properties - version = "7.3.0-8691043"; + version = "7.2.2-7984345"; pkgPath = "com/android/tools/build/aapt2"; repoUrl = "https://dl.google.com/dl/android/maven2"; @@ -29,20 +29,20 @@ let jar = fetchurl { url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}"; sha256 = getAttr platform { - linux = "sha256-AP75/vGPx4cOZ7K8w60FhZptB/836mGAdIJ2+gCtOVc="; - osx = "sha256-Kg400fBovA3RlRpdnAPZXnPBliXFq5df+OpfhiAkvUc="; + linux = "sha256-BKtK5f7lxp0YdQU4AFGL933vjEAykQ1RiKpDwfc32oI="; + osx = "sha256-OORgWnGQS0GwqZrSg8sFQb4FM23hrYHwmarcYd8EO/0="; }; }; sha = fetchurl { url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}.sha1"; sha256 = getAttr platform { - linux = "sha256-908Oq40eqHlu4KtlgJQIxyUu2IOyrtErjVc+MH5JM5E="; - osx = "sha256-hQQVMnqzaNd2v57uxWIzea21MlAuGur01T6fpcWD1fc="; + linux = "sha256-4F4REWQLj8hdnh1tIwRVgdWJjUBhvvINP56nIscwePA="; + osx = "sha256-n0jFUphzlFnNacolbXoNmNHs/hXfktVpYRlJ1JW9ukU="; }; }; pom = fetchurl { url = "${repoUrl}/${pkgPath}/${version}/${filenames.pom}"; - sha256 = "sha256-HVQS9Dt7vvFN/MLr7I103KTbWQw3i/eCMUL+lNDFt6Y="; + sha256 = "sha256-XWEn9Zvxv0hgYU2yUSlZ4OiguZy1bz+Gh0wRrm4d9GQ="; }; };