diff --git a/build-tools/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/util/ProjectReader.java b/build-tools/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/util/ProjectReader.java index 7e7c158e8..76adccbd8 100644 --- a/build-tools/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/util/ProjectReader.java +++ b/build-tools/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/util/ProjectReader.java @@ -30,7 +30,6 @@ import com.itsaky.androidide.tooling.api.model.internal.DefaultProjectSyncIssues import com.itsaky.androidide.tooling.api.model.internal.DefaultVariant; import com.itsaky.androidide.tooling.api.model.util.AndroidModulePropertyCopier; import com.itsaky.androidide.tooling.api.model.util.ProjectBuilder; -import com.itsaky.androidide.tooling.impl.LoggingOutputStream; import com.itsaky.androidide.tooling.impl.progress.LoggingProgressListener; import com.itsaky.androidide.utils.ILogger; @@ -41,7 +40,6 @@ import org.gradle.tooling.UnknownModelException; import org.gradle.tooling.model.GradleProject; import org.gradle.tooling.model.GradleTask; -import java.io.ByteArrayInputStream; import java.util.Collections; import java.util.Map; @@ -114,16 +112,7 @@ public class ProjectReader { private static void readDependencies(ProjectConnection connection, IdeAndroidModule android) { for (final var variant : android.getVariants()) { - fillVariantDependencies(connection, android, variant); - - // FIXME: Don't know how to fetch dependency jars using v2 model classes. - // This should be replaced with something that uses v2 of the model builder API - android.getVariantDependencyJars() - .put( - variant.getName(), - LegacyProjectReader.INSTANCE.findVariantDependencyJars( - connection, variant.getName())); } } @@ -231,7 +220,5 @@ public class ProjectReader { project.getProjectPath()); } - private static void configureBuilder(ConfigurableLauncher launcher) { - - } + private static void configureBuilder(ConfigurableLauncher launcher) {} } diff --git a/build-tools/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/model/IdeAndroidModule.kt b/build-tools/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/model/IdeAndroidModule.kt index 07e5a65e1..d4675e640 100644 --- a/build-tools/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/model/IdeAndroidModule.kt +++ b/build-tools/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/model/IdeAndroidModule.kt @@ -54,7 +54,6 @@ class IdeAndroidModule( AndroidProject { var variantDependencies: MutableMap = mutableMapOf() - var variantDependencyJars: MutableMap> = mutableMapOf() fun copy(): IdeAndroidModule { return IdeAndroidModule( @@ -78,7 +77,7 @@ class IdeAndroidModule( } override fun toString(): String { - return "IdeAndroidModule(dynamicFeatures=$dynamicFeatures, flags=$flags, javaCompileOptions=$javaCompileOptions, resourcePrefix=$resourcePrefix, variants=$variants, viewBindingOptions=$viewBindingOptions, lintChecksJars=$lintChecksJars, modelSyncFiles=$modelSyncFiles, variantDependencies=$variantDependencies, variantDependencyJars=$variantDependencyJars, androidTestNamespace=$androidTestNamespace, namespace='$namespace', testFixturesNamespace=$testFixturesNamespace)" + return "IdeAndroidModule(dynamicFeatures=$dynamicFeatures, flags=$flags, javaCompileOptions=$javaCompileOptions, resourcePrefix=$resourcePrefix, variants=$variants, viewBindingOptions=$viewBindingOptions, lintChecksJars=$lintChecksJars, modelSyncFiles=$modelSyncFiles, variantDependencies=$variantDependencies, androidTestNamespace=$androidTestNamespace, namespace='$namespace', testFixturesNamespace=$testFixturesNamespace)" } // These properties are not supported on newer versions