Try to exclude module-info

commonmark · Mar 2, 2024 · 9f2a3ed · 9f2a3ed
1 parent 2d8d817
commit 9f2a3ed
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/commonmark-android-test/app/build.gradle b/commonmark-android-test/app/build.gradle
@@ -28,15 +28,22 @@ android {
     // we add other modules sources in order for lint to process them (lint operates on sources)
     sourceSets {
         main {
-            java.srcDirs += [
-                    '../../commonmark',
-                    '../../commonmark-ext-autolink',
-                    '../../commonmark-ext-gfm-strikethrough',
-                    '../../commonmark-ext-gfm-tables',
-                    '../../commonmark-ext-heading-anchor',
-                    '../../commonmark-ext-ins',
-                    '../../commonmark-ext-yaml-front-matter'
-            ].collect { "$it/src/main/java" }
+            java {
+                [
+                        '../../commonmark',
+                        '../../commonmark-ext-autolink',
+                        '../../commonmark-ext-gfm-strikethrough',
+                        '../../commonmark-ext-gfm-tables',
+                        '../../commonmark-ext-heading-anchor',
+                        '../../commonmark-ext-ins',
+                        '../../commonmark-ext-yaml-front-matter'
+                ].forEach { d ->
+                    // don't include module-info files, otherwise we get
+                    // "too many module declarations found"
+                    PatternSet patternSet = new PatternSet().exclude('**/module-info.java')
+                    srcDirs += fileTree("$d/src/main/java").matching(patternSet)
+                }
+            }
         }
     }
 }

diff --git a/commonmark-android-test/app/src/main/AndroidManifest.xml b/commonmark-android-test/app/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
-<manifest package="org.commonmark.android.test">
+<manifest>
     <application />
 </manifest>