Prepare Version 0.1.1

tylerbwong · Nov 16, 2020 · bfca3ad · bfca3ad
1 parent 9a0b1f7
commit bfca3ad
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 2 deletions.
diff --git a/plugin/api/0.1.1.txt b/plugin/api/0.1.1.txt
@@ -0,0 +1,95 @@
+// Signature format: 3.0
+package me.tylerbwong.gradle.metalava {
+
+  public enum Documentation {
+    method public String toString();
+    method public static me.tylerbwong.gradle.metalava.Documentation valueOf(String name);
+    method public static me.tylerbwong.gradle.metalava.Documentation[] values();
+    enum_constant public static final me.tylerbwong.gradle.metalava.Documentation HIDDEN;
+    enum_constant public static final me.tylerbwong.gradle.metalava.Documentation PACKAGE;
+    enum_constant public static final me.tylerbwong.gradle.metalava.Documentation PRIVATE;
+    enum_constant public static final me.tylerbwong.gradle.metalava.Documentation PROTECTED;
+    enum_constant public static final me.tylerbwong.gradle.metalava.Documentation PUBLIC;
+  }
+
+  public enum Format {
+    method public String toString();
+    method public static me.tylerbwong.gradle.metalava.Format valueOf(String name);
+    method public static me.tylerbwong.gradle.metalava.Format[] values();
+    enum_constant public static final me.tylerbwong.gradle.metalava.Format V1;
+    enum_constant public static final me.tylerbwong.gradle.metalava.Format V2;
+    enum_constant public static final me.tylerbwong.gradle.metalava.Format V3;
+  }
+
+  public enum Signature {
+    method public String toString();
+    method public static me.tylerbwong.gradle.metalava.Signature valueOf(String name);
+    method public static me.tylerbwong.gradle.metalava.Signature[] values();
+    enum_constant public static final me.tylerbwong.gradle.metalava.Signature API;
+    enum_constant public static final me.tylerbwong.gradle.metalava.Signature DEX_API;
+    enum_constant public static final me.tylerbwong.gradle.metalava.Signature DEX_API_MAPPING;
+    enum_constant public static final me.tylerbwong.gradle.metalava.Signature PRIVATE_API;
+    enum_constant public static final me.tylerbwong.gradle.metalava.Signature PRIVATE_DEX_API;
+    enum_constant public static final me.tylerbwong.gradle.metalava.Signature REMOVED_API;
+  }
+
+}
+
+package me.tylerbwong.gradle.metalava.extension {
+
+  public class MetalavaExtension {
+    ctor public MetalavaExtension();
+    method public final me.tylerbwong.gradle.metalava.Documentation getDocumentation();
+    method public final String getFilename();
+    method public final me.tylerbwong.gradle.metalava.Format getFormat();
+    method public final java.util.Set<java.lang.String> getHiddenAnnotations();
+    method public final boolean getIncludeSignatureVersion();
+    method public final org.gradle.api.JavaVersion getJavaSourceLevel();
+    method public final String? getMetalavaJarPath();
+    method public final boolean getOmitCommonPackages();
+    method public final boolean getOutputDefaultValues();
+    method public final boolean getOutputKotlinNulls();
+    method public final boolean getReportLintsAsErrors();
+    method public final boolean getReportWarningsAsErrors();
+    method public final me.tylerbwong.gradle.metalava.Signature getSignature();
+    method public final String getVersion();
+    method public final void setDocumentation(me.tylerbwong.gradle.metalava.Documentation p);
+    method public final void setFilename(String p);
+    method public final void setFormat(me.tylerbwong.gradle.metalava.Format p);
+    method public final void setIncludeSignatureVersion(boolean p);
+    method public final void setJavaSourceLevel(org.gradle.api.JavaVersion p);
+    method public final void setMetalavaJarPath(String? p);
+    method public final void setOmitCommonPackages(boolean p);
+    method public final void setOutputDefaultValues(boolean p);
+    method public final void setOutputKotlinNulls(boolean p);
+    method public final void setReportLintsAsErrors(boolean p);
+    method public final void setReportWarningsAsErrors(boolean p);
+    method public final void setSignature(me.tylerbwong.gradle.metalava.Signature p);
+    method public final void setVersion(String p);
+    property public final me.tylerbwong.gradle.metalava.Documentation documentation;
+    property public final String filename;
+    property public final me.tylerbwong.gradle.metalava.Format format;
+    property public final java.util.Set<java.lang.String> hiddenAnnotations;
+    property public final boolean includeSignatureVersion;
+    property public final org.gradle.api.JavaVersion javaSourceLevel;
+    property public final String? metalavaJarPath;
+    property public final boolean omitCommonPackages;
+    property public final boolean outputDefaultValues;
+    property public final boolean outputKotlinNulls;
+    property public final boolean reportLintsAsErrors;
+    property public final boolean reportWarningsAsErrors;
+    property public final me.tylerbwong.gradle.metalava.Signature signature;
+    property public final String version;
+  }
+
+}
+
+package me.tylerbwong.gradle.metalava.plugin {
+
+  public final class MetalavaPlugin implements org.gradle.api.Plugin<org.gradle.api.Project> {
+    ctor public MetalavaPlugin();
+    method public void apply(org.gradle.api.Project target);
+  }
+
+}
+
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "me.tylerbwong.gradle"
-version = "0.1.0"
+version = "0.1.1"
 
 gradlePlugin {
     plugins {

diff --git a/plugin/src/main/kotlin/me/tylerbwong/gradle/metalava/task/MetalavaCheckCompatibility.kt b/plugin/src/main/kotlin/me/tylerbwong/gradle/metalava/task/MetalavaCheckCompatibility.kt
@@ -27,6 +27,10 @@ internal object MetalavaCheckCompatibility : MetalavaTaskContainer() {
                 classpath(extension.metalavaJarPath?.let { files(it) } ?: getMetalavaClasspath(extension.version))
                 dependsOn(generateTempMetalavaSignatureTask)
 
+                // TODO Consolidate flags between tasks
+                val hidePackages = extension.hiddenPackages.flatMap { listOf("--hide-package", it) }
+                val hideAnnotations = extension.hiddenAnnotations.flatMap { listOf("--hide-annotation", it) }
+
                 val args: List<String> = listOf(
                     "--no-banner",
                     "--no-color",
@@ -35,7 +39,7 @@ internal object MetalavaCheckCompatibility : MetalavaTaskContainer() {
                     "--check-compatibility:api:current", extension.filename,
                     "--input-kotlin-nulls=${extension.outputKotlinNulls.flagValue}"
                 ) + extension.reportWarningsAsErrors.flag("--warnings-as-errors") +
-                    extension.reportLintsAsErrors.flag("--lints-as-errors")
+                    extension.reportLintsAsErrors.flag("--lints-as-errors")  + hidePackages + hideAnnotations
 
                 isIgnoreExitValue = false
                 setArgs(args)