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.

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

Fix API warning task #138

Merged
merged 3 commits into from
May 6, 2024
Merged

Fix API warning task #138

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
1a54503
linting
daymxn May 3, 2024
3d0c137
Check if files exist in combined tasks
daymxn May 3, 2024
cfc8b8b
Use fallback version for release tasks
daymxn May 3, 2024
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
6 changes: 3 additions & 3 deletions plugins/src/main/java/com/google/gradle/plugins/ReleasePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ abstract class ReleasePlugin : Plugin<Project> {
val deleteChangeFiles = tasks.named<Delete>("deleteChangeFiles")

val releaseNotes = makeReleaseNotes.flatMap { it.outputFile }
val releasingVersion =
releaseNotes.map { parseReleaseVersion(it.asFile) }.orElse(moduleVersion)
val releasingVersion = releaseNotes.map { parseReleaseVersion(it.asFile, moduleVersion) }

val updateVersion =
tasks.register<VersionBumpTask>("updateVersion") {
Expand Down Expand Up @@ -96,7 +95,8 @@ abstract class ReleasePlugin : Plugin<Project> {
}
}

private fun parseReleaseVersion(releaseNotes: File): ModuleVersion {
private fun parseReleaseVersion(releaseNotes: File, fallback: ModuleVersion): ModuleVersion {
if (!releaseNotes.exists()) return fallback
val version = releaseNotes.readFirstLine().substringAfter("#").trim()

return ModuleVersion.fromStringOrNull(version)
Expand Down
2 changes: 1 addition & 1 deletion plugins/src/main/java/com/google/gradle/tasks/CombineApiChangesTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ abstract class CombineApiChangesTask : DefaultTask() {
@TaskAction
fun add() {
val projectNameToChangeFile =
apiChangesFiles.get().map { it.nameWithoutExtension to it.readText() }
apiChangesFiles.get().filter { it.exists() }.map { it.nameWithoutExtension to it.readText() }

val texts = projectNameToChangeFile.joinToString("\n\n") { spoiler(it.first, it.second) }

Expand Down
2 changes: 1 addition & 1 deletion plugins/src/main/java/com/google/gradle/tasks/CombineReleaseNotesTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ abstract class CombineReleaseNotesTask : DefaultTask() {
@TaskAction
fun add() {
val projectNameToReleaseNotes =
releaseNoteFiles.get().map { it.nameWithoutExtension to it.readText() }
releaseNoteFiles.get().filter { it.exists() }.map { it.nameWithoutExtension to it.readText() }

val texts =
projectNameToReleaseNotes.map {
Expand Down
1 change: 0 additions & 1 deletion plugins/src/main/java/com/google/gradle/tasks/MakeReleaseNotesTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import com.google.gradle.types.ModuleVersion
import com.google.gradle.types.VersionType
import java.io.File
import org.gradle.api.DefaultTask
import org.gradle.api.file.RegularFile
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.ListProperty
import org.gradle.api.provider.Property
Expand Down
Loading