@@ -21,8 +21,10 @@ import static com.autonomousapps.kit.gradle.dependencies.Dependencies.commonsCol
2121/**
2222 * app (is android and should be)
2323 * +--- assets (is android and should be)
24- * +--- lib-android (is android and shouldn't be)
24+ * +--- lib-android-java-deps (is android and shouldn't be)
2525 * \--- lib-java
26+ * +--- lib-android-android-deps (is android and should be)
27+ * \--- assets
2628 * \--- lib-java (is java and not a candidate)
2729 */
2830final class CouldBeAndroidProject extends AbstractAndroidProject {
@@ -91,7 +93,7 @@ final class CouldBeAndroidProject extends AbstractAndroidProject {
9193 )
9294 assets. strings = AndroidStringRes . DEFAULT
9395 }
94- .withAndroidLibProject(' lib-android' , ' com.example.lib' ) { lib ->
96+ .withAndroidLibProject(' lib-android-java-deps ' , ' com.example.lib' ) { lib ->
9597 lib. withBuildScript { bs ->
9698 bs. plugins = androidLibPlugin
9799 bs. android = defaultAndroidLibBlock(false , ' com.example.lib' )
@@ -101,6 +103,15 @@ final class CouldBeAndroidProject extends AbstractAndroidProject {
101103 ]
102104 }
103105 }
106+ .withAndroidLibProject(' lib-android-android-deps' , ' com.example.lib' ) { lib ->
107+ lib. withBuildScript { bs ->
108+ bs. plugins = androidLibPlugin
109+ bs. android = defaultAndroidLibBlock(false , ' com.example.lib' )
110+ bs. dependencies = [
111+ project(' implementation' , ' :assets' )
112+ ]
113+ }
114+ }
104115 .withSubproject(' lib-java' ) { lib ->
105116 lib. withBuildScript { bs ->
106117 bs. plugins = [Plugin . javaLibrary, Plugins . dependencyAnalysisNoVersion]
@@ -145,7 +156,7 @@ final class CouldBeAndroidProject extends AbstractAndroidProject {
145156 }
146157 ]
147158
148- private static Set<ModuleAdvice > libAndroidScore = [
159+ private static Set<ModuleAdvice > libAndroidHasJavaDepsScore = [
149160 androidScoreBuilder(). with {
150161 hasAndroidAssets = false
151162 hasAndroidRes = false
@@ -155,18 +166,30 @@ final class CouldBeAndroidProject extends AbstractAndroidProject {
155166 build()
156167 }
157168 ]
169+ private static Set<ModuleAdvice > libAndroidHasAndroidDepsScore = [
170+ androidScoreBuilder(). with {
171+ hasAndroidAssets = false
172+ hasAndroidRes = false
173+ usesAndroidClasses = false
174+ hasBuildConfig = false
175+ hasAndroidDependencies = true
176+ build()
177+ }
178+ ]
158179
159180 final Map<String , Set<ModuleAdvice > > expectedModuleAdvice = [
160- ' :app' : emptyModuleAdvice,
161- ' :assets' : assetsScore,
162- ' :lib-android' : libAndroidScore,
163- ' :lib-java' : emptyModuleAdvice,
181+ ' :app' : emptyModuleAdvice,
182+ ' :assets' : assetsScore,
183+ ' :lib-android-java-deps' : libAndroidHasJavaDepsScore,
184+ ' :lib-android-android-deps' : libAndroidHasAndroidDepsScore,
185+ ' :lib-java' : emptyModuleAdvice,
164186 ]
165187
166188 final Map<String , Set<ModuleAdvice > > expectedModuleAdviceForIgnore = [
167- ' :app' : emptyModuleAdvice,
168- ' :assets' : emptyModuleAdvice,
169- ' :lib-android' : emptyModuleAdvice,
170- ' :lib-java' : emptyModuleAdvice,
189+ ' :app' : emptyModuleAdvice,
190+ ' :assets' : emptyModuleAdvice,
191+ ' :lib-android-java-deps' : emptyModuleAdvice,
192+ ' :lib-android-android-deps' : emptyModuleAdvice,
193+ ' :lib-java' : emptyModuleAdvice,
171194 ]
172195}
0 commit comments