From 20d34ad8705565c239f7581e097cf9db5158367f Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 28 Sep 2022 00:10:15 +0900 Subject: [PATCH] Upgrade to JApicmp Gradle Plugin 0.4.1 (#3435) This commit also replaces method excludes with METHOD_NEW_DEFAULT compatibility change exclude. Closes gh-3181 --- build.gradle | 25 +++---------------------- buildscript-gradle.lockfile | 2 +- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index c3ed8100bd..730cb157e8 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { classpath 'io.spring.nohttp:nohttp-gradle:0.0.10' classpath 'org.gradle:test-retry-gradle-plugin:1.4.1' classpath 'io.github.gradle-nexus:publish-plugin:1.1.0' - classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.4.0' + classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.4.1' classpath 'de.undercouch:gradle-download-task:5.0.2' classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.34' @@ -338,32 +338,13 @@ subprojects { ignoreMissingClasses = true includeSynthetic = true + compatibilityChangeExcludes = [ "METHOD_NEW_DEFAULT" ] + packageExcludes = ['io.micrometer.shaded.*', 'io.micrometer.statsd.internal'] // For 1.8.x branch only. classExcludes = ['io.micrometer.core.instrument.util.JsonUtils'] - // TODO remove methodExcludes when gh-3181 is resolved - methodExcludes = ['io.micrometer.stackdriver.StackdriverConfig#metricTypePrefix()', - 'io.micrometer.core.instrument.Timer#record(java.util.function.BooleanSupplier)', - 'io.micrometer.core.instrument.Timer#record(java.util.function.IntSupplier)', - 'io.micrometer.core.instrument.Timer#record(java.util.function.LongSupplier)', - 'io.micrometer.core.instrument.Timer#record(java.util.function.DoubleSupplier)', - 'io.micrometer.core.instrument.LongTaskTimer#record(java.util.function.BooleanSupplier)', - 'io.micrometer.core.instrument.LongTaskTimer#record(java.util.function.IntSupplier)', - 'io.micrometer.core.instrument.LongTaskTimer#record(java.util.function.LongSupplier)', - 'io.micrometer.core.instrument.LongTaskTimer#record(java.util.function.DoubleSupplier)', - 'io.micrometer.signalfx.SignalFxConfig#publishDeltaHistogram()', - - // For 1.8.x branch only. - 'io.micrometer.core.instrument.binder.mongodb.MongoCommandTagsProvider#commandStarted(com.mongodb.event.CommandStartedEvent)', - 'io.micrometer.dynatrace.DynatraceConfig#apiVersion()', - 'io.micrometer.dynatrace.DynatraceConfig#defaultDimensions()', - 'io.micrometer.dynatrace.DynatraceConfig#enrichWithDynatraceMetadata()', - 'io.micrometer.dynatrace.DynatraceConfig#metricKeyPrefix()', - 'io.micrometer.elastic.ElasticConfig#apiKeyCredentials()', - 'io.micrometer.stackdriver.StackdriverConfig#useSemanticMetricTypes()' - ] onlyIf { compatibleVersion != 'SKIP' } } diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile index 877796d7df..192189f852 100644 --- a/buildscript-gradle.lockfile +++ b/buildscript-gradle.lockfile @@ -58,7 +58,7 @@ jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.activation:activation:1.1=classpath joda-time:joda-time:2.10=classpath -me.champeau.gradle:japicmp-gradle-plugin:0.4.0=classpath +me.champeau.gradle:japicmp-gradle-plugin:0.4.1=classpath net.java.dev.jna:jna-platform:5.7.0=classpath net.java.dev.jna:jna:5.7.0=classpath net.java.dev.jna:platform:3.4.0=classpath