diff --git a/prepare/android-lint/build.gradle.kts b/prepare/android-lint/build.gradle.kts
index 7f050f3d72e..1a1ed0036a0 100644
--- a/prepare/android-lint/build.gradle.kts
+++ b/prepare/android-lint/build.gradle.kts
@@ -23,18 +23,7 @@ dependencies {
 }
 
 runtimeJar {
-    /*
-        TODO: `fromEmbeddedComponents()` should be used here.
-        Couldn't use it because of the "must be locked before it can be used to compute a classpath" error.
-     */
-    projectsToShadow.forEach {
-        dependsOn("$it:classes")
-        project(it).let { p ->
-            p.pluginManager.withPlugin("java") {
-                from(p.the<JavaPluginConvention>().sourceSets.getByName("main").output)
-            }
-        }
-    }
+    fromEmbeddedComponents()
 }
 
 ideaPlugin()