Skip to content

Commit eced0e2

Browse files
authored
Merge pull request #2372 from ryanjbaxter/fix-gradle-deprecations
Fix plugin descriptor generation to use gradlePlugin DSL
2 parents d82f521 + 5a5ce5b commit eced0e2

File tree

4 files changed

+19
-35
lines changed

4 files changed

+19
-35
lines changed

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,19 @@ apply from: "$rootDir/gradle/release.gradle"
3232

3333
group = 'org.springframework.cloud'
3434

35+
gradlePlugin {
36+
plugins {
37+
springCloudContractPlugin {
38+
id = 'org.springframework.cloud.contract'
39+
implementationClass = 'org.springframework.cloud.contract.verifier.plugin.SpringCloudContractVerifierGradlePlugin'
40+
}
41+
springCloudContractPluginAlias {
42+
id = 'spring-cloud-contract'
43+
implementationClass = 'org.springframework.cloud.contract.verifier.plugin.SpringCloudContractVerifierGradlePlugin'
44+
}
45+
}
46+
}
47+
3548
repositories {
3649
mavenLocal()
3750
mavenCentral()

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,14 @@ if (isReleaseToCentral) {
6262

6363
plugins {
6464
springCloudContractPlugin {
65-
id = 'org.springframework.cloud.contract'
66-
displayName = 'spring-cloud-contract'
65+
displayName = 'Spring Cloud Contract Gradle Plugin'
66+
description = 'Spring Cloud Contract Gradle Plugin'
67+
tags.set(['spring', 'spring-framework', 'spring-cloud', 'spring-cloud-contract'])
68+
}
69+
springCloudContractPluginAlias {
70+
displayName = 'Spring Cloud Contract Gradle Plugin (Alias)'
6771
description = 'Spring Cloud Contract Gradle Plugin'
6872
tags.set(['spring', 'spring-framework', 'spring-cloud', 'spring-cloud-contract'])
69-
implementationClass = 'org.springframework.cloud.contract.verifier.plugin.SpringCloudContractVerifierGradlePlugin'
7073
}
7174
}
7275
}

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.springframework.cloud.contract.properties

Lines changed: 0 additions & 16 deletions
This file was deleted.

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/resources/META-INF/gradle-plugins/spring-cloud-contract.properties

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)