Check for AspectJ and android conflicts

freefair · Dec 15, 2022 · a6c2df4 · a6c2df4
1 parent af507ce
commit a6c2df4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJPlugin.java b/aspectj-plugin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJPlugin.java
@@ -33,6 +33,13 @@ public void apply(Project project) {
             throw new IllegalStateException("Another aspectj plugin (which is excludes this one) has already been applied to the project.");
         }
 
+        project.getPlugins().withId("com.android.application", ignored -> {
+            throw new IllegalStateException("The 'io.freefair.aspectj' plugin is not compatible with android projects");
+        });
+        project.getPlugins().withId("com.android.library", ignored -> {
+            throw new IllegalStateException("The 'io.freefair.aspectj' plugin is not compatible with android projects");
+        });
+
         this.project = project;
         project.getPlugins().apply(AspectJBasePlugin.class);
         project.getPlugins().apply(JavaBasePlugin.class);

diff --git a/...gin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJPostCompileWeavingPlugin.java b/...gin/src/main/java/io/freefair/gradle/plugins/aspectj/AspectJPostCompileWeavingPlugin.java
@@ -36,6 +36,13 @@ public void apply(Project project) {
             throw new IllegalStateException("Another aspectj plugin (which is excludes this one) has already been applied to the project.");
         }
 
+        project.getPlugins().withId("com.android.application", ignored -> {
+            throw new IllegalStateException("The 'io.freefair.aspectj.post-compile-weaving' plugin is not compatible with android projects");
+        });
+        project.getPlugins().withId("com.android.library", ignored -> {
+            throw new IllegalStateException("The 'io.freefair.aspectj.post-compile-weaving' plugin is not compatible with android projects");
+        });
+
         this.project = project;
         aspectjBasePlugin = project.getPlugins().apply(AspectJBasePlugin.class);