Skip to content

Commit ea1a10d

Browse files
committed
Fix applying easymvp-compiler when user has both annotationProcessor and apt plugins
1 parent cd4555a commit ea1a10d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ buildscript {
3535
jcenter()
3636
}
3737
dependencies {
38-
classpath 'com.sixthsolution.easymvp:easymvp-plugin:1.0.0'
38+
classpath 'com.sixthsolution.easymvp:easymvp-plugin:1.0.1'
3939
}
4040
}
4141
```

easymvp-plugin/src/main/groovy/easymvp/gradle/plugin/EasyMVPPlugin.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class EasyMVPPlugin implements Plugin<Project> {
6060

6161
if (isKotlinProject) {
6262
project.dependencies.add("kapt", "$GROUP:easymvp-compiler:$VERSION")
63-
} else if (hasConfiguration("annotationProcessor")) {
63+
} else if (hasConfiguration("annotationProcessor") && !hasPlugin("com.neenbedankt.android-apt")) {
6464
project.dependencies.add("annotationProcessor", "$GROUP:easymvp-compiler:$VERSION")
6565
} else {
6666
project.dependencies.add("apt", "$GROUP:easymvp-compiler:$VERSION")

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
GROUP=com.sixthsolution.easymvp
2-
VERSION_NAME=1.0.0
2+
VERSION_NAME=1.0.1
33
org.gradle.jvmargs=-Xmx2048m

0 commit comments

Comments
 (0)