diff --git a/.gitignore b/.gitignore
index 5ddd9fc95..4568d7a75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ test-output/
 out/
 .idea_modules/
 *.iws
+*.iml
diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index 80d96e00c..592f54595 100644
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -34,6 +34,11 @@
 			<groupId>com.google.dagger</groupId>
 			<artifactId>dagger</artifactId>
 		</dependency>
+		
+		<dependency>
+			<groupId>com.google.dagger</groupId>
+			<artifactId>dagger-compiler</artifactId>
+		</dependency>
 
 		<!-- Logging -->
 		<dependency>
diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
index 1d2ae0e0a..97721fd3b 100644
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -34,6 +34,10 @@
 			<groupId>com.google.dagger</groupId>
 			<artifactId>dagger</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.google.dagger</groupId>
+			<artifactId>dagger-compiler</artifactId>
+		</dependency>
 		
 		<!-- Logging -->
 		<dependency>
diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml
index bb55d145b..3c97807ef 100644
--- a/main/launcher/pom.xml
+++ b/main/launcher/pom.xml
@@ -34,6 +34,10 @@
 			<groupId>com.google.dagger</groupId>
 			<artifactId>dagger</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.google.dagger</groupId>
+			<artifactId>dagger-compiler</artifactId>
+		</dependency>
 
 		<!-- Logging -->
 		<dependency>
diff --git a/main/pom.xml b/main/pom.xml
index a4b939426..f972debd3 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -164,6 +164,12 @@
 				<artifactId>dagger</artifactId>
 				<version>${dagger.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.google.dagger</groupId>
+				<artifactId>dagger-compiler</artifactId>
+				<version>${dagger.version}</version>
+				<optional>true</optional>
+			</dependency>
 			<dependency>
 				<groupId>com.google.code.gson</groupId>
 				<artifactId>gson</artifactId>
@@ -302,17 +308,10 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.6.1</version>
+				<version>3.7.0</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
-					<annotationProcessorPaths>
-						<path>
-							<groupId>com.google.dagger</groupId>
-							<artifactId>dagger-compiler</artifactId>
-							<version>${dagger.version}</version>
-						</path>
-					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index e09ff0db5..c5a0980c9 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -72,6 +72,10 @@
 			<groupId>com.google.dagger</groupId>
 			<artifactId>dagger</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.google.dagger</groupId>
+			<artifactId>dagger-compiler</artifactId>
+		</dependency>
 
 		<!-- Zxcvbn -->
 		<dependency>