Skip to content

Set has android dependencies weight to 100 #1438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2025
Merged

Set has android dependencies weight to 100 #1438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 34 additions & 11 deletions src/functionalTest/groovy/com/autonomousapps/android/projects/CouldBeAndroidProject.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ import static com.autonomousapps.kit.gradle.dependencies.Dependencies.commonsCol
/**
* app (is android and should be)
* +--- assets (is android and should be)
* +--- lib-android (is android and shouldn't be)
* +--- lib-android-java-deps (is android and shouldn't be)
* \--- lib-java
* +--- lib-android-android-deps (is android and should be)
* \--- assets
* \--- lib-java (is java and not a candidate)
*/
final class CouldBeAndroidProject extends AbstractAndroidProject {
Expand Down Expand Up @@ -91,7 +93,7 @@ final class CouldBeAndroidProject extends AbstractAndroidProject {
)
assets.strings = AndroidStringRes.DEFAULT
}
.withAndroidLibProject('lib-android', 'com.example.lib') { lib ->
.withAndroidLibProject('lib-android-java-deps', 'com.example.lib') { lib ->
lib.withBuildScript { bs ->
bs.plugins = androidLibPlugin
bs.android = defaultAndroidLibBlock(false, 'com.example.lib')
Expand All @@ -101,6 +103,15 @@ final class CouldBeAndroidProject extends AbstractAndroidProject {
]
}
}
.withAndroidLibProject('lib-android-android-deps', 'com.example.lib') { lib ->
lib.withBuildScript { bs ->
bs.plugins = androidLibPlugin
bs.android = defaultAndroidLibBlock(false, 'com.example.lib')
bs.dependencies = [
project('implementation', ':assets')
]
}
}
.withSubproject('lib-java') { lib ->
lib.withBuildScript { bs ->
bs.plugins = [Plugin.javaLibrary, Plugins.dependencyAnalysisNoVersion]
Expand Down Expand Up @@ -145,7 +156,7 @@ final class CouldBeAndroidProject extends AbstractAndroidProject {
}
]

private static Set<ModuleAdvice> libAndroidScore = [
private static Set<ModuleAdvice> libAndroidHasJavaDepsScore = [
androidScoreBuilder().with {
hasAndroidAssets = false
hasAndroidRes = false
Expand All @@ -155,18 +166,30 @@ final class CouldBeAndroidProject extends AbstractAndroidProject {
build()
}
]
private static Set<ModuleAdvice> libAndroidHasAndroidDepsScore = [
androidScoreBuilder().with {
hasAndroidAssets = false
hasAndroidRes = false
usesAndroidClasses = false
hasBuildConfig = false
hasAndroidDependencies = true
build()
}
]

final Map<String, Set<ModuleAdvice>> expectedModuleAdvice = [
':app' : emptyModuleAdvice,
':assets' : assetsScore,
':lib-android': libAndroidScore,
':lib-java' : emptyModuleAdvice,
':app' : emptyModuleAdvice,
':assets' : assetsScore,
':lib-android-java-deps' : libAndroidHasJavaDepsScore,
':lib-android-android-deps': libAndroidHasAndroidDepsScore,
':lib-java' : emptyModuleAdvice,
]

final Map<String, Set<ModuleAdvice>> expectedModuleAdviceForIgnore = [
':app' : emptyModuleAdvice,
':assets' : emptyModuleAdvice,
':lib-android': emptyModuleAdvice,
':lib-java' : emptyModuleAdvice,
':app' : emptyModuleAdvice,
':assets' : emptyModuleAdvice,
':lib-android-java-deps' : emptyModuleAdvice,
':lib-android-android-deps': emptyModuleAdvice,
':lib-java' : emptyModuleAdvice,
]
}
2 changes: 1 addition & 1 deletion src/main/kotlin/com/autonomousapps/model/ModuleAdvice.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ data class AndroidScore(
if (hasAndroidRes) count += 2
if (usesAndroidClasses) count += 2
if (hasBuildConfig) count += 0.5f
if (hasAndroidDependencies) count += 0.5f
if (hasAndroidDependencies) count += 100f
count
}

Expand Down
2 changes: 0 additions & 2 deletions src/test/kotlin/com/autonomousapps/internal/reason/ModuleAdviceExplainerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ internal class ModuleAdviceExplainerTest {
// Given
val score = Fixture.emptyScore.copy(
hasBuildConfig = true,
hasAndroidDependencies = true
)
val computer = Fixture(
unfilteredAndroidScore = score,
Expand All @@ -55,7 +54,6 @@ internal class ModuleAdviceExplainerTest {

Android features:
* Includes BuildConfig.
* Has Android library dependencies.
""".trimIndent().lines()
).inOrder()
}
Expand Down