Skip to content

Adjust Metalava SemVer task #6846

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 7 commits into from
Apr 10, 2025
Merged

Adjust Metalava SemVer task #6846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
225e30a
Adjust Metalava SemVer task
emilypgoogle Apr 8, 2025
cd34772
Format
emilypgoogle Apr 8, 2025
f41bda4
Remove unused import
emilypgoogle Apr 8, 2025
61a88c0
Merge branch 'main' into ep/metalava-semver-fix
emilypgoogle Apr 8, 2025
4beff13
Merge branch 'main' into ep/metalava-semver-fix
emilypgoogle Apr 9, 2025
5c2c3dd
Merge branch 'main' into ep/metalava-semver-fix
rlazo Apr 9, 2025
6be5158
Adjustments
emilypgoogle Apr 9, 2025
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
10 changes: 4 additions & 6 deletions .github/workflows/metalava-semver-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ jobs:
permissions:
pull-requests: write
steps:
- name: Checkout main
- name: Checkout PR
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.base_ref }}

- name: Set up JDK 17
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
Expand All @@ -21,13 +19,13 @@ jobs:
distribution: temurin
cache: gradle

- name: Copy previous api.txt files
- name: Copy new api.txt files
run: ./gradlew copyApiTxtFile

- name: Checkout PR
- name: Checkout main
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.head_ref }}
ref: ${{ github.base_ref }}
clean: false

- name: Run Metalava SemVer check
Expand Down
7 changes: 3 additions & 4 deletions plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,12 @@ class FirebaseAndroidLibraryPlugin : BaseFirebaseLibraryPlugin() {

project.tasks.register<CopyApiTask>("copyApiTxtFile") {
apiTxtFile.set(project.file("api.txt"))
output.set(project.file("previous_api.txt"))
output.set(project.file("new_api.txt"))
}

project.tasks.register<SemVerTask>("metalavaSemver") {
apiTxtFile.set(project.file("api.txt"))
otherApiFile.set(project.file("previous_api.txt"))
outputApiFile.set(project.file("opi.txt"))
apiTxtFile.set(project.file("new_api.txt"))
otherApiFile.set(project.file("api.txt"))
currentVersionString.value(firebaseLibrary.version)
previousVersionString.value(firebaseLibrary.previousVersion)
}
Expand Down
7 changes: 3 additions & 4 deletions plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,12 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {

project.tasks.register<CopyApiTask>("copyApiTxtFile") {
apiTxtFile.set(project.file("api.txt"))
output.set(project.file("previous_api.txt"))
output.set(project.file("new_api.txt"))
}

project.tasks.register<SemVerTask>("metalavaSemver") {
apiTxtFile.set(project.file("api.txt"))
otherApiFile.set(project.file("previous_api.txt"))
outputApiFile.set(project.file("opi.txt"))
apiTxtFile.set(project.file("new_api.txt"))
otherApiFile.set(project.file("api.txt"))
currentVersionString.value(firebaseLibrary.version)
previousVersionString.value(firebaseLibrary.previousVersion)
}
Expand Down
3 changes: 1 addition & 2 deletions plugins/src/main/java/com/google/firebase/gradle/plugins/SemVerTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.Property
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputFile
import org.gradle.api.tasks.OutputFile
import org.gradle.api.tasks.TaskAction

abstract class SemVerTask : DefaultTask() {
Expand All @@ -33,7 +32,7 @@ abstract class SemVerTask : DefaultTask() {
@get:Input abstract val currentVersionString: Property<String>
@get:Input abstract val previousVersionString: Property<String>

@get:OutputFile abstract val outputApiFile: RegularFileProperty
// TODO cache output

@TaskAction
fun run() {
Expand Down
Loading