Merge pull request #80 from wix-playground/fix-buildd

Fix BlazeScalaAttachSourceProvider

Author: mildagle

scala/src/com/google/idea/blaze/scala/libraries/BlazeScalaAttachSourceProvider.java

@@ -13,7 +13,6 @@
 import com.google.idea.blaze.scala.sync.model.BlazeScalaSyncData;
 import com.google.idea.common.experiments.BoolExperiment;
 import com.google.idea.common.util.Transactions;
-import com.google.idea.sdkcompat.general.BaseSdkCompat;
 import com.google.idea.sdkcompat.java.AttachSourcesProviderAdapter;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.TransactionGuard;
@@ -28,6 +27,7 @@
 import java.util.Collection;
 import java.util.List;
 import javax.annotation.Nullable;
+import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProviderImpl;
 
 public class BlazeScalaAttachSourceProvider extends AttachSourcesProviderAdapter {
 
@@ -141,8 +141,7 @@ private static void attachSources(
     ApplicationManager.getApplication()
         .runWriteAction(
             () -> {
-              IdeModifiableModelsProvider modelsProvider =
-                  BaseSdkCompat.createModifiableModelsProvider(project);
+              IdeModifiableModelsProvider modelsProvider = new IdeModifiableModelsProviderImpl(project);
               for (BlazeLibrary blazeLibrary : librariesToAttachSourceTo) {
                 // Make sure we don't do it twice
                 if (AttachedSourceJarManager.getInstance(project)