Fix fabric api build test
This commit is contained in:
		
							parent
							
								
									ea8ee4c21a
								
							
						
					
					
						commit
						52873435b7
					
				
					 3 changed files with 25 additions and 2 deletions
				
			
		|  | @ -26,7 +26,7 @@ package net.fabricmc.loom.test | ||||||
| 
 | 
 | ||||||
| class LoomTestConstants { | class LoomTestConstants { | ||||||
|     public final static String DEFAULT_GRADLE = "7.0.1" |     public final static String DEFAULT_GRADLE = "7.0.1" | ||||||
|     public final static String PRE_RELEASE_GRADLE = "7.3-20210904222223+0000" |     public final static String PRE_RELEASE_GRADLE = "7.3-20210906222431+0000" | ||||||
| 
 | 
 | ||||||
|     public final static String[] STANDARD_TEST_VERSIONS = [DEFAULT_GRADLE, PRE_RELEASE_GRADLE] |     public final static String[] STANDARD_TEST_VERSIONS = [DEFAULT_GRADLE, PRE_RELEASE_GRADLE] | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -45,7 +45,8 @@ class FabricAPITest extends Specification implements GradleProjectTestTrait { | ||||||
| 			def gradle = gradleProject( | 			def gradle = gradleProject( | ||||||
| 					repo: "https://github.com/FabricMC/fabric.git", | 					repo: "https://github.com/FabricMC/fabric.git", | ||||||
| 					commit: "fc40aa9d88e9457957bdf3f8cec9698846828cd3", | 					commit: "fc40aa9d88e9457957bdf3f8cec9698846828cd3", | ||||||
| 					version: version | 					version: version, | ||||||
|  | 					patch: "fabric_api" | ||||||
| 			) | 			) | ||||||
| 
 | 
 | ||||||
| 			// Set the version to something constant | 			// Set the version to something constant | ||||||
|  |  | ||||||
							
								
								
									
										22
									
								
								src/test/resources/patches/fabric_api.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								src/test/resources/patches/fabric_api.patch
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,22 @@ | ||||||
|  | diff --git a/build.gradle b/build.gradle
 | ||||||
|  | --- a/build.gradle	(revision fc40aa9d88e9457957bdf3f8cec9698846828cd3)
 | ||||||
|  | +++ b/build.gradle	(date 1631009569915)
 | ||||||
|  | @@ -257,6 +257,9 @@
 | ||||||
|  |  		setupRepositories(repositories) | ||||||
|  |  	} | ||||||
|  | 
 | ||||||
|  | +	// Required as moduleDependencies modifies the pom
 | ||||||
|  | +	loom.disableDeprecatedPomGeneration(publishing.publications.mavenJava)
 | ||||||
|  | +
 | ||||||
|  |  	javadoc.enabled = false | ||||||
|  |  } | ||||||
|  | 
 | ||||||
|  | @@ -296,6 +299,8 @@
 | ||||||
|  |  	setupRepositories(repositories) | ||||||
|  |  } | ||||||
|  | 
 | ||||||
|  | +loom.disableDeprecatedPomGeneration(publishing.publications.mavenJava)
 | ||||||
|  | +
 | ||||||
|  |  void setupRepositories(RepositoryHandler repositories) { | ||||||
|  |  	//repositories.mavenLocal() // uncomment for testing | ||||||
|  |  	def ENV = System.getenv() | ||||||
		Loading…
	
		Reference in a new issue