48
48
import com .intellij .openapi .vfs .VirtualFileContentsChangedAdapter ;
49
49
import com .intellij .openapi .vfs .VirtualFileManager ;
50
50
import com .intellij .serviceContainer .ComponentManagerImpl ;
51
- import com .intellij .util .ReflectionUtil ;
51
+ import com .intellij .util .ReflectionUtil ;
52
52
import com .intellij .util .modules .CircularModuleDependenciesDetector ;
53
53
import io .flutter .sdk .AbstractLibraryManager ;
54
54
import io .flutter .sdk .FlutterSdkUtil ;
55
55
import io .flutter .settings .FlutterSettings ;
56
56
import io .flutter .utils .FlutterModuleUtils ;
57
+
57
58
import java .lang .reflect .InvocationTargetException ;
58
59
import java .lang .reflect .Method ;
59
60
import java .nio .file .Path ;
62
63
import java .util .concurrent .atomic .AtomicBoolean ;
63
64
import java .util .function .Function ;
64
65
import java .util .stream .Collectors ;
66
+
65
67
import org .jetbrains .android .facet .AndroidFacet ;
66
68
import org .jetbrains .annotations .NotNull ;
67
69
import org .jetbrains .annotations .Nullable ;
@@ -91,7 +93,7 @@ public AndroidModuleLibraryManager(@NotNull Project project) {
91
93
}
92
94
93
95
public void update () {
94
- doGradleSync (getProject (), this :: scheduleAddAndroidLibraryDeps );
96
+ doGradleSync (getProject (), androidProject -> androidProject != null ? scheduleAddAndroidLibraryDeps ( androidProject ) : null );
95
97
}
96
98
97
99
private Void scheduleAddAndroidLibraryDeps (@ NotNull Project androidProject ) {
@@ -198,7 +200,7 @@ private void scheduleUpdate() {
198
200
}
199
201
200
202
final Runnable runnable = this ::updateAndroidLibraries ;
201
- DumbService .getInstance (getProject ()).smartInvokeLater (runnable , ModalityState .NON_MODAL );
203
+ DumbService .getInstance (getProject ()).smartInvokeLater (runnable , ModalityState .nonModal () );
202
204
}
203
205
204
206
private void updateAndroidLibraries () {
@@ -208,7 +210,7 @@ private void updateAndroidLibraries() {
208
210
update ();
209
211
}
210
212
211
- private void doGradleSync (Project flutterProject , Function <Project , Void > callback ) {
213
+ private void doGradleSync (@ NotNull Project flutterProject , @ NotNull Function <Project , Void > callback ) {
212
214
// TODO(messick): Collect URLs for all Android modules, including those within plugins.
213
215
VirtualFile dir = flutterProject .getBaseDir ().findChild ("android" );
214
216
if (dir == null ) dir = flutterProject .getBaseDir ().findChild (".android" ); // For modules.
@@ -218,13 +220,6 @@ private void doGradleSync(Project flutterProject, Function<Project, Void> callba
218
220
Disposer .register (flutterProject , androidProject );
219
221
220
222
GradleSyncListener listener = new GradleSyncListener () {
221
- public void syncTaskCreated (@ NotNull Project project , @ NotNull GradleSyncInvoker .Request request ) {}
222
-
223
- // TODO(messick) Remove when 3.6 is stable.
224
- public void syncStarted (@ NotNull Project project , boolean skipped , boolean sourceGenerationRequested ) {}
225
-
226
- public void setupStarted (@ NotNull Project project ) {}
227
-
228
223
@ Override
229
224
public void syncSucceeded (@ NotNull Project project ) {
230
225
if (isUpdating .get ()) {
@@ -315,8 +310,8 @@ private class EmbeddedAndroidProject extends ProjectImpl {
315
310
private Path path ;
316
311
317
312
protected EmbeddedAndroidProject (@ NotNull Path filePath ) {
318
- super ((ComponentManagerImpl ) ApplicationManager .getApplication (), filePath , TEMPLATE_PROJECT_NAME );
319
- path = filePath ;
313
+ super ((ComponentManagerImpl )ApplicationManager .getApplication (), filePath , TEMPLATE_PROJECT_NAME );
314
+ path = filePath ;
320
315
}
321
316
322
317
static final String TEMPLATE_PROJECT_NAME = "_android" ;
0 commit comments