Update gradle + fix build
This commit is contained in:
		
							parent
							
								
									88315e4ccf
								
							
						
					
					
						commit
						b2f78a3904
					
				
					 4 changed files with 5 additions and 4 deletions
				
			
		|  | @ -67,7 +67,7 @@ dependencies { | ||||||
|     shade ('net.minecraft:launchwrapper:1.12') { |     shade ('net.minecraft:launchwrapper:1.12') { | ||||||
|         transitive = false |         transitive = false | ||||||
|     } |     } | ||||||
|      | 
 | ||||||
|     shade('org.spongepowered:mixin:0.7.11-SNAPSHOT') { |     shade('org.spongepowered:mixin:0.7.11-SNAPSHOT') { | ||||||
|         exclude module: 'launchwrapper' |         exclude module: 'launchwrapper' | ||||||
|         exclude module: 'guava' |         exclude module: 'guava' | ||||||
|  | @ -93,7 +93,7 @@ jar { | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| task wrapper(type: Wrapper) { | task wrapper(type: Wrapper) { | ||||||
|     gradleVersion = '4.9' |     gradleVersion = '4.10.2' | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| publishing { | publishing { | ||||||
|  |  | ||||||
							
								
								
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										3
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							|  | @ -1,6 +1,5 @@ | ||||||
| #Mon May 14 11:21:37 BST 2018 |  | ||||||
| distributionBase=GRADLE_USER_HOME | distributionBase=GRADLE_USER_HOME | ||||||
| distributionPath=wrapper/dists | distributionPath=wrapper/dists | ||||||
|  | distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
| zipStorePath=wrapper/dists | zipStorePath=wrapper/dists | ||||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip |  | ||||||
|  |  | ||||||
|  | @ -49,6 +49,8 @@ public class Constants { | ||||||
| 	public static final IDelayed<File> MAPPINGS_DIR = new DelayedFile(extension -> new File(POMF_DIR.get(extension), "pomf-enigma-" + extension.version + "." + extension.pomfVersion + "")); | 	public static final IDelayed<File> MAPPINGS_DIR = new DelayedFile(extension -> new File(POMF_DIR.get(extension), "pomf-enigma-" + extension.version + "." + extension.pomfVersion + "")); | ||||||
| 	public static       IDelayed<File> MAPPINGS_TINY_GZ = new DelayedFile(extension -> new File(POMF_DIR.get(extension), "pomf-tiny-" + extension.version + "." + extension.pomfVersion + ".gz")); | 	public static       IDelayed<File> MAPPINGS_TINY_GZ = new DelayedFile(extension -> new File(POMF_DIR.get(extension), "pomf-tiny-" + extension.version + "." + extension.pomfVersion + ".gz")); | ||||||
| 	public static final IDelayed<File> MAPPINGS_TINY = new DelayedFile(extension -> new File(POMF_DIR.get(extension), "pomf-tiny-" + extension.version + "." + extension.pomfVersion)); | 	public static final IDelayed<File> MAPPINGS_TINY = new DelayedFile(extension -> new File(POMF_DIR.get(extension), "pomf-tiny-" + extension.version + "." + extension.pomfVersion)); | ||||||
|  | 	public static final IDelayed<File> MAPPINGS_MIXIN_EXPORT = new DelayedFile(extension -> new File(CACHE_FILES, "mixin-map-" + extension.version + "." + extension.pomfVersion + ".mappings")); | ||||||
|  | 
 | ||||||
| 
 | 
 | ||||||
| 	public static final IDelayed<File> MAPPINGS_DIR_LOCAL = new DelayedFile(extension -> new File(WORKING_DIRECTORY, "mappings")); | 	public static final IDelayed<File> MAPPINGS_DIR_LOCAL = new DelayedFile(extension -> new File(WORKING_DIRECTORY, "mappings")); | ||||||
| 	public static final IDelayed<File> MAPPINGS_ZIP_LOCAL = new DelayedFile(extension -> new File(MAPPINGS_DIR_LOCAL.get(extension), "pomf-enigma-" + extension.version + ".zip")); | 	public static final IDelayed<File> MAPPINGS_ZIP_LOCAL = new DelayedFile(extension -> new File(MAPPINGS_DIR_LOCAL.get(extension), "pomf-enigma-" + extension.version + ".zip")); | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue