Remove Dagger

Author: pbreault

build.gradle

@@ -8,7 +8,6 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "net.ltgt.gradle:gradle-apt-plugin:0.9"
     }
 }
 
@@ -23,7 +22,6 @@ targetCompatibility = 1.8
 
 apply plugin: 'java'
 apply plugin: 'kotlin'
-apply plugin: 'kotlin-kapt'
 
 
 repositories {
@@ -59,8 +57,6 @@ dependencies {
     compile "org.jooq:joor-java-8:0.9.7"
     compileOnly fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar'])
     compileOnly fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar'])
-    compile 'com.google.dagger:dagger:2.6'
-    kapt "com.google.dagger:dagger-compiler:2.6"
 
     testCompile 'junit:junit:4.12'
     testCompile fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar'])

src/main/java/com/developerphil/adbidea/dagger/PluginComponent.java

@@ -24,16 +24,14 @@ public class DeviceChooserDialog extends DialogWrapper {
     private JPanel myPanel;
     private JPanel myDeviceChooserWrapper;
     private JCheckBox useSameDeviceSCheckBox;
-
-    @Inject
-    PluginPreferences pluginPreferences;
+    private PluginPreferences pluginPreferences;
 
     public DeviceChooserDialog(@NotNull final AndroidFacet facet) {
         super(facet.getModule().getProject(), true);
         setTitle(AndroidBundle.message("choose.device.dialog.title"));
 
         myProject = facet.getModule().getProject();
-        myProject.getComponent(ObjectGraph.class).inject(this);
+        pluginPreferences = myProject.getComponent(ObjectGraph.class).getPluginPreferences();
 
         getOKAction().setEnabled(false);
 

src/main/java/com/developerphil/adbidea/dagger/PluginModule.java

@@ -1,27 +1,29 @@
 package com.developerphil.adbidea
 
-import com.developerphil.adbidea.dagger.DaggerPluginComponent
-import com.developerphil.adbidea.dagger.PluginComponent
-import com.developerphil.adbidea.dagger.PluginModule
+import com.developerphil.adbidea.accessor.preference.ProjectPreferenceAccessor
+import com.developerphil.adbidea.adb.BridgeImpl
+import com.developerphil.adbidea.adb.DeviceResultFetcher
+import com.developerphil.adbidea.adb.UseSameDevicesHelper
 import com.intellij.openapi.components.ProjectComponent
 import com.intellij.openapi.project.Project
 
-class ObjectGraph(project: Project) : ProjectComponent,
-        PluginComponent by DaggerPluginComponent.builder().pluginModule(PluginModule(project)).build() {
+// This is more of a service locator than a proper DI framework.
+// It's not used often enough in the codebase to warrant the complexity of a DI solution like dagger.
+class ObjectGraph(private val project: Project) : ProjectComponent {
 
-    override fun projectOpened() {
-    }
+    val deviceResultFetcher by lazy { DeviceResultFetcher(project, useSameDevicesHelper, bridge) }
+    val pluginPreferences: PluginPreferences by lazy { PluginPreferencesImpl(preferenceAccessor) }
 
-    override fun projectClosed() {
-    }
+    private val useSameDevicesHelper by lazy { UseSameDevicesHelper(pluginPreferences, bridge) }
+    private val preferenceAccessor by lazy { ProjectPreferenceAccessor(project) }
+    private val bridge by lazy { BridgeImpl(project) }
 
-    override fun initComponent() {
-    }
 
-    override fun disposeComponent() {
-    }
+    // Project Component Boilerplate
+    override fun projectOpened() = Unit
 
-    override fun getComponentName(): String {
-        return "DaggerObjectGraph"
-    }
+    override fun projectClosed() = Unit
+    override fun initComponent() = Unit
+    override fun disposeComponent() = Unit
+    override fun getComponentName(): String = "InjectionObjectGraph"
 }

src/main/java/com/developerphil/adbidea/ui/DeviceChooserDialog.java

@@ -3,15 +3,14 @@ package com.developerphil.adbidea.adb
 import com.android.ddmlib.IDevice
 import com.intellij.openapi.project.Project
 import org.jetbrains.android.sdk.AndroidSdkUtils
-import javax.inject.Inject
 
 interface Bridge {
     fun isReady(): Boolean
     fun connectedDevices(): List<IDevice>
 }
 
 
-class BridgeImpl @Inject constructor(project: Project) : Bridge {
+class BridgeImpl(project: Project) : Bridge {
 
     val androidBridge = AndroidSdkUtils.getDebugBridge(project)