From 8384201aef5338c024b48f05d5f9bb4c93c6e2a0 Mon Sep 17 00:00:00 2001 From: Tyler Wong Date: Thu, 11 Jul 2024 17:22:48 -0700 Subject: [PATCH] Adhere to finalized api --- README.md | 2 +- .../gradle/metalava/task/MetalavaCheckCompatibilityTask.kt | 5 +---- .../gradle/metalava/task/MetalavaGenerateSignatureTask.kt | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index a7d2048..f270fe8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # metalava-gradle [![Build](https://github.com/tylerbwong/metalava-gradle/actions/workflows/build.yml/badge.svg)](https://github.com/tylerbwong/metalava-gradle/actions/workflows/build.yml) [![Gradle Plugin Portal](https://img.shields.io/maven-metadata/v/https/plugins.gradle.org/m2/me/tylerbwong/gradle/metalava/me.tylerbwong.gradle.metalava.gradle.plugin/maven-metadata.xml.svg?colorB=007ec6&label=Gradle%20Plugin%20Portal)](https://plugins.gradle.org/plugin/me.tylerbwong.gradle.metalava) -[![Metalava](https://img.shields.io/badge/Metalava-1.0.0--alpha10-orange)](https://maven.google.com/web/index.html#com.android.tools.metalava:metalava:1.0.0-alpha10) +[![Metalava](https://img.shields.io/badge/Metalava-1.0.0--alpha11-orange)](https://maven.google.com/web/index.html#com.android.tools.metalava:metalava:1.0.0-alpha11) A Gradle plugin for [Metalava](https://android.googlesource.com/platform/tools/metalava/), AOSP's tool for API metadata extraction and compatibility tracking. diff --git a/plugin/src/main/kotlin/me/tylerbwong/gradle/metalava/task/MetalavaCheckCompatibilityTask.kt b/plugin/src/main/kotlin/me/tylerbwong/gradle/metalava/task/MetalavaCheckCompatibilityTask.kt index 865668a..0b724c0 100644 --- a/plugin/src/main/kotlin/me/tylerbwong/gradle/metalava/task/MetalavaCheckCompatibilityTask.kt +++ b/plugin/src/main/kotlin/me/tylerbwong/gradle/metalava/task/MetalavaCheckCompatibilityTask.kt @@ -45,10 +45,7 @@ internal abstract class MetalavaCheckCompatibilityTask @Inject constructor( metalavaGenerateSignatureInternal(filenameOverride = tempFilename.get(), awaitWork = true) val hidePackages = hiddenPackages.get().flatMap { listOf("--hide-package", it) } val hideAnnotations = hiddenAnnotations.get().flatMap { listOf("--hide-annotation", it) } - val apiCompatAnnotations = listOf( - "--api-compat-annotations", - apiCompatAnnotations.get().joinToString(), - ) + val apiCompatAnnotations = apiCompatAnnotations.get().flatMap { listOf("--api-compat-annotation", it) } val args: List = listOf( "--format=${format.get()}", diff --git a/plugin/src/main/kotlin/me/tylerbwong/gradle/metalava/task/MetalavaGenerateSignatureTask.kt b/plugin/src/main/kotlin/me/tylerbwong/gradle/metalava/task/MetalavaGenerateSignatureTask.kt index 9126f54..5bb36fc 100644 --- a/plugin/src/main/kotlin/me/tylerbwong/gradle/metalava/task/MetalavaGenerateSignatureTask.kt +++ b/plugin/src/main/kotlin/me/tylerbwong/gradle/metalava/task/MetalavaGenerateSignatureTask.kt @@ -82,10 +82,7 @@ internal abstract class MetalavaGenerateSignatureTask @Inject constructor( .joinToString(File.pathSeparator) val hidePackages = hiddenPackages.get().flatMap { listOf("--hide-package", it) } val hideAnnotations = hiddenAnnotations.get().flatMap { listOf("--hide-annotation", it) } - val apiCompatAnnotations = listOf( - "--api-compat-annotations", - apiCompatAnnotations.get().joinToString(), - ) + val apiCompatAnnotations = apiCompatAnnotations.get().flatMap { listOf("--api-compat-annotation", it) } val keepFilename = keepFilename.orNull val keepFileFlags = if (!keepFilename.isNullOrEmpty()) { listOf("--proguard", keepFilename)