Merge pull request #2370 from ryanjbaxter/fix-gradle-deprecations

Fix Gradle deprecations to be compatible with Gradle 10

Author: ryanjbaxter

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

@@ -6,7 +6,7 @@ buildscript {
 		gradlePluginPortal()
 	}
 	dependencies {
-		classpath 'com.gradle.publish:plugin-publish-plugin:0.14.0'
+		classpath 'com.gradle.publish:plugin-publish-plugin:1.3.0'
 	}
 }
 
@@ -35,13 +35,14 @@ group = 'org.springframework.cloud'
 repositories {
 	mavenLocal()
 	mavenCentral()
-	maven { url "https://repo.spring.io/snapshot" }
-	maven { url "https://repo.spring.io/milestone" }
+	maven { url = "https://repo.spring.io/snapshot" }
+	maven { url = "https://repo.spring.io/milestone" }
 }
 
 tasks.withType(JavaCompile).configureEach {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
+    options.compilerArgs.add('-Xlint:deprecation')
 }
 
 //Dependencies in all subprojects - https://solidsoft.wordpress.com/2014/11/13/gradle-tricks-display-dependencies-for-all-subprojects-in-multi-project-build/

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

@@ -18,11 +18,8 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 	from javadoc.destinationDir
 }
 
-artifacts {
-	archives sourcesJar
-	archives groovydocJar
-	archives javadocJar
-}
+// Add jars as dependencies to the assemble task instead of using the archives configuration
+assemble.dependsOn sourcesJar, groovydocJar, javadocJar
 
 ext {
 	resolveRepoName = { Project project ->

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.java

@@ -61,7 +61,6 @@
 import org.springframework.cloud.contract.stubrunner.StubRunnerOptionsBuilder;
 import org.springframework.cloud.contract.stubrunner.StubRunnerPropertyUtils;
 import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties;
-import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 
 // TODO: Convert to incremental task: https://docs.gradle.org/current/userguide/custom_tasks.html#incremental_tasks
@@ -262,7 +261,7 @@ private DownloadedData downloadContracts() {
 		return new DownloadedData(contractsSubDirIfPresent(downloadedContracts), inclusionProperties);
 	}
 
-	private void throwExceptionWhenFailOnNoContracts(@Nullable File file, String contractsRepository) {
+	private void throwExceptionWhenFailOnNoContracts(File file, String contractsRepository) {
 		if (StringUtils.hasText(contractsRepository)) {
 			if (getLogger().isDebugEnabled()) {
 				getLogger().debug(
@@ -521,7 +520,6 @@ private StubRunnerOptions createStubRunnerOptions() {
 		return options.build();
 	}
 
-	@Nullable
 	private String discoverGitCommitId(Map<String, String> props) {
 		String repositoryUrl = contractRepository.getRepositoryUrl().getOrNull();
 		if (repositoryUrl != null && ScmStubDownloaderBuilder.isProtocolAccepted(repositoryUrl)) {

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java

@@ -228,7 +228,6 @@ private void configureConfigurations() {
 		contractTestRuntimeOnly.extendsFrom(testRuntimeOnly);
 
 		configurations.create(CONTRACT_TEST_GENERATOR_RUNTIME_CLASSPATH_CONFIGURATION_NAME, conf -> {
-			conf.setVisible(false);
 			conf.setCanBeResolved(true);
 			conf.setCanBeConsumed(false);
 			conf.attributes(attributes -> {
@@ -366,7 +365,8 @@ private void registerStubsJarTask(ContractVerifierExtension extension,
 			stubsJar.dependsOn(copyContracts);
 			stubsJar.dependsOn(generateClientStubs);
 		});
-		project.artifacts(artifactHandler -> artifactHandler.add("archives", verifierStubsJar));
+		// Add verifierStubsJar as a dependency to the assemble task instead of using the archives configuration
+		project.getTasks().named("assemble").configure(task -> task.dependsOn(verifierStubsJar));
 	}
 
 	private TaskProvider<ContractsCopyTask> registerCopyContractsTask(ContractVerifierExtension extension) {