Skip to content

Fix NullPointerException when resolving ownership #90

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
handstandsam merged 3 commits into from
Jan 6, 2026
+35 −16
Merged

Fix NullPointerException when resolving ownership #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
720e6da
Fixing Gradle issues
handstandsam Jan 5, 2026
290d269
Fixed null pointer issue by using OwnerInfo.UNOWNED instead
handstandsam Jan 6, 2026
95b37bc
Allow using cache during tests
handstandsam Jan 6, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:


- name: Test on Ubuntu
run: ./gradlew assemble check --no-build-cache --no-daemon --stacktrace
run: ./gradlew assemble check --no-daemon --stacktrace

# Deploy to Github Pages
github-pages:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ jobs:
uses: gradle/actions/wrapper-validation@v3

- name: Test on Ubuntu
run: ./gradlew assemble check --no-build-cache --no-daemon --stacktrace
run: ./gradlew assemble check --no-daemon --stacktrace
12 changes: 8 additions & 4 deletions invert-gradle-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ plugins {
}

afterEvaluate {
tasks.named("publishMavenPublicationToMavenCentralRepository") {
mustRunAfter(tasks.named("signPluginMavenPublication"))
tasks.findByName("publishMavenPublicationToMavenCentralRepository")?.let { publishTask ->
tasks.findByName("signPluginMavenPublication")?.let { signTask ->
publishTask.mustRunAfter(signTask)
}
}
tasks.named("publishPluginMavenPublicationToMavenCentralRepository") {
mustRunAfter(tasks.named("signMavenPublication"))
tasks.findByName("publishPluginMavenPublicationToMavenCentralRepository")?.let { publishTask ->
tasks.findByName("signMavenPublication")?.let { signTask ->
publishTask.mustRunAfter(signTask)
}
}
}

Expand Down
11 changes: 5 additions & 6 deletions ...adle-plugin/src/main/kotlin/com/squareup/invert/internal/report/js/InvertJsReportUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.squareup.invert.models.ConfigurationName
import com.squareup.invert.models.DependencyId
import com.squareup.invert.models.GradlePluginId
import com.squareup.invert.models.ModulePath
import com.squareup.invert.models.OwnerInfo
import com.squareup.invert.models.OwnerName
import com.squareup.invert.models.Stat
import com.squareup.invert.models.StatDataType
Expand Down Expand Up @@ -46,7 +47,7 @@ object InvertJsReportUtils {
allProjectsStatsData: StatsJsReportModel,
collectedOwnershipInfo: OwnershipJsReportModel
): Map<StatKey, StatTotalAndMetadata> {
val moduleToOwnerMap = collectedOwnershipInfo.modules
val moduleToOwnerMap: Map<ModulePath, OwnerName> = collectedOwnershipInfo.modules
val allStatMetadatas: List<StatMetadata> = allProjectsStatsData.statInfos.values
.filter { statInfo ->
when (statInfo.dataType) {
Expand All @@ -61,14 +62,12 @@ object InvertJsReportUtils {

val globalTotals = mutableMapOf<StatKey, StatTotalAndMetadata>()
allStatMetadatas.forEach { statMetadata: StatMetadata ->
var totalCount = 0 // Total count of the stat across all modules

val ownerToTotalCountForStat = mutableMapOf<OwnerName, Int>()

allProjectsStatsData.statsByModule.entries.forEach { (modulePath, statTotalAndMetadata) ->
val stat: Stat? = statTotalAndMetadata[statMetadata.key]
allProjectsStatsData.statsByModule.entries.forEach { (modulePath, statTotalAndMetadata: Map<StatKey, Stat>) ->
val stat: Stat? = statTotalAndMetadata.get(statMetadata.key)
if (stat != null) {
val moduleOwnerName = moduleToOwnerMap[modulePath]!!
val moduleOwnerName = moduleToOwnerMap[modulePath] ?: OwnerInfo.UNOWNED
Copy link
Collaborator Author

@handstandsam handstandsam Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the fix!


val currentCountForOwner: Int = ownerToTotalCountForStat.getOrDefault(moduleOwnerName, 0)
when (stat) {
Expand Down
12 changes: 8 additions & 4 deletions invert-owners-github/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@ plugins {
}

afterEvaluate {
tasks.named("publishMavenPublicationToMavenCentralRepository") {
mustRunAfter(tasks.named("signPluginMavenPublication"))
tasks.findByName("signPluginMavenPublication")?.let { signTask ->
tasks.named("publishMavenPublicationToMavenCentralRepository") {
mustRunAfter(signTask)
}
}
tasks.named("publishPluginMavenPublicationToMavenCentralRepository") {
mustRunAfter(tasks.named("signMavenPublication"))
tasks.findByName("signMavenPublication")?.let { signTask ->
tasks.named("publishPluginMavenPublicationToMavenCentralRepository") {
mustRunAfter(signTask)
}
}
}

Expand Down
12 changes: 12 additions & 0 deletions invert-report/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@ project(":invert-report") {
"jsBrowserDevelopmentWebpack"
}
val reportWebpackTask = tasks.named(webpackTaskName)

// Fix implicit dependency issues between webpack and compile sync tasks
tasks.named("jsBrowserProductionWebpack").configure {
dependsOn("jsDevelopmentExecutableCompileSync")
dependsOn("jsProductionExecutableCompileSync")
}

tasks.named("jsBrowserDevelopmentWebpack").configure {
dependsOn("jsDevelopmentExecutableCompileSync")
dependsOn("jsProductionExecutableCompileSync")
}

project(":invert-gradle-plugin").tasks.named("processResources").configure {
dependsOn(reportWebpackTask)
}
Expand Down