Skip to content

Commit

Permalink
Upgrade to JApicmp Gradle Plugin 0.4.1 (#3435)
Browse files Browse the repository at this point in the history
This commit also replaces method excludes with METHOD_NEW_DEFAULT compatibility change exclude.

Closes gh-3181
  • Loading branch information
izeye committed Sep 27, 2022
1 parent d99e554 commit 20d34ad
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 23 deletions.
25 changes: 3 additions & 22 deletions build.gradle
Expand Up @@ -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'

Expand Down Expand Up @@ -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' }
}

Expand Down
2 changes: 1 addition & 1 deletion buildscript-gradle.lockfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 20d34ad

Please sign in to comment.