Skip to content
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.

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

Update dependencies and fix javadoc artifacts #127

Merged
merged 2 commits into from
Oct 9, 2023
Merged

Conversation

pkwarren
Copy link
Contributor

@pkwarren pkwarren commented Oct 9, 2023

Update to the latest versions of spotless, android libraries, and the Maven plugin. Fix javadoc generation for Maven artifacts (previously empty).

Fixes #94.

Update to the latest versions of spotless, android libraries, and
the Maven plugin. Fix javadoc generation for Maven artifacts (previously
empty).
build.gradle.kts Outdated Show resolved Hide resolved
Comment on lines +45 to +46
// Defaulted to true.
generateCoroutineMethods = parameters[COROUTINE_SIGNATURE]?.toBoolean() ?: true,
Copy link
Contributor

Choose a reason for hiding this comment

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

IMO it was clearer before, but if this violates a lint rule it's not a big deal

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah this failed a new lint rule that required comments to be on their own lines.

mapOf(
"ktlint_experimental" to "enabled",
// Disabled until https://github.com/pinterest/ktlint/pull/2273 is released
"ktlint_standard_function-expression-body" to "disabled",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a new experimental rule. In some cases it does the right thing but without the fix above it leads to compile errors. It also is rewriting a large number of files - I might just leave this disabled and manually update the simpler methods to follow the recommended style.

skipDeprecated.set(true)
jdkVersion.set(8)
perPackageOption {
matchingRegex.set("build\\.buf.*")
suppress.set(true)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was causing docs not to be included.

}
}
if (name == "dokkaGfm") {
outputDirectory.set(project.file("${project.rootDir}/docs/3.x"))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure where this is coming from - we don't publish GFM anywhere so I've switched to the standard dokkaHtml format.


[libraries]
android = { module = "com.google.android:android", version.ref = "android" }
android-material = { module = "com.google.android.material:material", version = "1.9.0" }
android-material = { module = "com.google.android.material:material", version = "1.10.0" }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This requires a new Android SDK.

@pkwarren pkwarren merged commit ec5b9aa into main Oct 9, 2023
7 checks passed
@pkwarren pkwarren deleted the pkw/update-deps branch October 9, 2023 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix javadoc artifacts
2 participants