diff options
| author | Bradley Smith <smithbradley@google.com> | 2022-01-25 07:17:37 -0800 |
|---|---|---|
| committer | Bradley Smith <smithbradley@google.com> | 2022-03-11 08:22:16 +0000 |
| commit | 993428c7fcf6cf349e2b705487619879202b3929 (patch) | |
| tree | d7a6699001d5dad5c4d8874e520a0fe7a02dc716 /android/testSrc | |
| parent | 9b98fe54944516d0abbfdc3f820fe3f30d95ba2c (diff) | |
| download | idea-993428c7fcf6cf349e2b705487619879202b3929.tar.gz | |
Move to using ExternalProject for PSD
This change stop requesting the JavaModuleModel via the PSD only fetch
models call and replaces it with jetbrains ExternalProject instead. We
also adjust PsJavaModule to update resolved dependencies on init, this
it already done by the PsAndroidModule and allows updated information to
be displayed once model fetching is complete.
Bug: N/A
Test: N/A
Change-Id: I42a88ec7a4ec5e17ea2cba3c28ac9cb89b9803b7
Diffstat (limited to 'android/testSrc')
| -rw-r--r-- | android/testSrc/com/android/tools/idea/gradle/project/sync/GradleSyncExecutorTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/testSrc/com/android/tools/idea/gradle/project/sync/GradleSyncExecutorTest.java b/android/testSrc/com/android/tools/idea/gradle/project/sync/GradleSyncExecutorTest.java index 1e1834c3343..290a3cae6f6 100644 --- a/android/testSrc/com/android/tools/idea/gradle/project/sync/GradleSyncExecutorTest.java +++ b/android/testSrc/com/android/tools/idea/gradle/project/sync/GradleSyncExecutorTest.java @@ -26,7 +26,6 @@ import static com.intellij.openapi.vfs.VfsUtil.saveText; import com.android.tools.idea.gradle.model.IdeSyncIssue; import com.android.tools.idea.gradle.project.model.GradleAndroidModel; import com.android.tools.idea.gradle.project.model.GradleModuleModel; -import com.android.tools.idea.gradle.project.model.JavaModuleModel; import com.android.tools.idea.gradle.project.sync.idea.GradleSyncExecutor; import com.android.tools.idea.gradle.project.sync.issues.SyncIssues; import com.android.tools.idea.gradle.project.sync.messages.GradleSyncMessages; @@ -43,6 +42,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.jetbrains.annotations.NotNull; +import org.jetbrains.plugins.gradle.model.ExternalProject; public class GradleSyncExecutorTest extends GradleSyncIntegrationTestCase { protected GradleSyncExecutor mySyncExecutor; @@ -144,7 +144,7 @@ public class GradleSyncExecutorTest extends GradleSyncIntegrationTestCase { } private static void assertContainsJavaModels(@NotNull GradleModuleModels models) { - assertModelsPresent(models, JavaModuleModel.class, GradleModuleModel.class); + assertModelsPresent(models, ExternalProject.class, GradleModuleModel.class); } private static void assertModelsPresent(@NotNull GradleModuleModels models, @NotNull Class<?>... expectedModelTypes) { |