aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/net/fabricmc/loom/build
AgeCommit message (Collapse)Author
2021-11-13Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0shedaniel
# Conflicts: # src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java # src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy
2021-11-12Fix `namedElements` not extending from api (#533)modmuss50
* Fix `namedElements` not extending from api Fix artifact not waiting for remapAllJars with shared caches * Use apiElements * Add a better test for this. * Also add remapped api mods to namedElements
2021-10-26Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0shedaniel
# Conflicts: # build.gradle # src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java # src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java # src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java # src/main/java/net/fabricmc/loom/task/RemapJarTask.java # src/main/java/net/fabricmc/loom/util/FileSystemUtil.java # src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java
2021-10-26Use NIO instead of ZipUtil (#513)shedaniel
* Use nio for zip utils * Make tests work * Please work * Fix some issues with tests * Fix more issues with tests * NIOZipUtils -> ZipUtils * Resolve Juuxel's reviews * Use our own FS utils * Improve error handling, add loom Pair * Add Unit tests + fixes Co-authored-by: modmuss50 <modmuss50@gmail.com>
2021-09-28Fix #54shedaniel
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-09-22Fix srg not merging correctly and fix #42shedaniel
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-09-21Make MixinRefmapHelper properly get the mixin configsshedaniel
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-09-11Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/futureshedaniel
# Conflicts: # build.gradle # src/main/java/net/fabricmc/loom/LoomGradleExtension.java # src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java # src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java # src/main/java/net/fabricmc/loom/build/MixinRefmapHelper.java # src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java # src/main/java/net/fabricmc/loom/configuration/MavenPublication.java # src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java # src/main/java/net/fabricmc/loom/extension/MinecraftGradleExtension.java # src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java # src/main/java/net/fabricmc/loom/task/RemapJarTask.java # src/main/java/net/fabricmc/loom/util/Constants.java # src/main/java/net/fabricmc/loom/util/SourceRemapper.java # src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
2021-09-07Update checkstyle to prevent using var expect for new instance creation.modmuss50
2021-09-07Use tiny-remapper to remap mixin annotation. (#441)Logic
* use tiny-remapper 0.5.0 * add property of useLegacyMixinAp and rename mixin to mixinAp * disable mixin ap if useLegacyMixinAp is false * fix tests * remove experimental for mixinAp * enable mixin remapper * revert changes on API * rename MixinAp*** to Mixin*** * move useLegacyMixinAp inside MixinExtension * cleaner code * update test Co-authored-by: modmuss50 <modmuss50@gmail.com>
2021-08-31Refactor and improve tests (#466)modmuss50
* Install and run a production server in tests * Small improvements * Add FabricAPI build test Create new GradleProjectTestTrait replacing the old trait Improve groovy code formatting. * Refactor tests * Fix MultiProjectTest + fix logging for fabric api test * Cleanup and fixes * Update fabric api + run in parallel for speed * Set server memory + fix error
2021-08-14Merge remote-tracking branch 'FabricMC/exp/0.10' into dev/futureshedaniel
Signed-off-by: shedaniel <daniel@shedaniel.me> # Conflicts: # src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java # src/main/java/net/fabricmc/loom/configuration/providers/mappings/GradleMappingContext.java # src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingsDependency.java # src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java # src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java # src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
2021-08-14Merge remote-tracking branch 'FabricMC/exp/0.10' into dev/futureshedaniel
# Conflicts: # bootstrap/test-project/build.gradle # build.gradle # src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java # src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java # src/main/java/net/fabricmc/loom/task/RemapSourcesJarTask.java
2021-08-13File Structure Changes (#462)shedaniel
* File Structure changes * Fix checkstyle * Fix processed jars * Fix unpick tests * Resolve reviews * Fix merge conflicts
2021-08-14Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9shedaniel
# Conflicts: # build.gradle # src/main/java/net/fabricmc/loom/LoomGradleExtension.java # src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java # src/main/java/net/fabricmc/loom/build/JarRemapper.java # src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java # src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java # src/main/java/net/fabricmc/loom/configuration/providers/mappings/GradleMappingContext.java # src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java # src/main/java/net/fabricmc/loom/task/AbstractLoomTask.java # src/main/java/net/fabricmc/loom/task/AbstractRunTask.java # src/main/java/net/fabricmc/loom/task/LoomTasks.java # src/main/java/net/fabricmc/loom/util/Constants.java # src/main/java/net/fabricmc/loom/util/SourceRemapper.java # src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy # src/test/resources/projects/kotlin/build.gradle.kts
2021-08-11Fix #469 (#470)modmuss50
2021-07-31Add modCompileOnlyApi, modRuntimeOnly; deprecate modRuntime (#458)Juuxel
2021-07-28fix #448 (#451)Logic
* fix #448 * minor fix
2021-07-26Use Property in LoomGradleExtension & Move task groups to constants (#445)shedaniel
* Use Property in LoomGradleExtension Signed-off-by: shedaniel <daniel@shedaniel.me> * Fix customMinecraftManifest Signed-off-by: shedaniel <daniel@shedaniel.me> * Add deprecation messages, let's wait for the tests to run to fix the tests that are using deprecated apis Signed-off-by: shedaniel <daniel@shedaniel.me> * Apply license Signed-off-by: shedaniel <daniel@shedaniel.me> * Update src/main/java/net/fabricmc/loom/util/DeprecationHelper.java Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> * Fix some tests, move mixinRefmapName -> mixin.defaultRefmapName Signed-off-by: shedaniel <daniel@shedaniel.me> * Move back to the api Signed-off-by: shedaniel <daniel@shedaniel.me> * Fix some tests Signed-off-by: shedaniel <daniel@shedaniel.me> * Apply reviews Signed-off-by: shedaniel <daniel@shedaniel.me> * Update src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> Co-authored-by: modmuss50 <modmuss50@gmail.com>
2021-07-23Ensure files are closed and outputs cleaned up when remapping.modmuss50
2021-07-20Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9shedaniel
# Conflicts: # src/main/java/net/fabricmc/loom/LoomGradleExtension.java # src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java # src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java # src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java # src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java # src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java # src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java # src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
2021-07-18Better Mixin AP configuration (#423)LogicFan
* [SPON-15] Apply Mixin AP config for all projects. * Revert "[SPON-15] Apply Mixin AP config for all projects." This reverts commit 93576e83b1221949d551b6307938f7dd6dc8fbbe. * use setter & getter * fix broken test introduced in 54d6ef7896f22f89d6594703d09e3195c814cf10 * initial commit for mixin extension * refactor getConfiguration * apply mixin extension * [SPON-15] allow across project AP config * [SPON-15] revert some changes * [SPON-15] refactor codes * [SPON-15] fix bugs * [SPON-15] bring back cross-project apconfig * [SPON-15] bug fix: move add default sourceSet earlier * [SPON-15] fix style * [SPON-15] refactor MixinAPExtension * add test * update test * [SPON-15] fix test * Update MixinAnnotationProcessorExtension.java * [SPON-15] fix test * fix deprecated gradle API * [SPON-15] refactor ApInvoker * [SPON-15] refactor ApInvoker * allow change refmap name in sourceSet bases * add new condition on test * [SPON-15] fix wrong suffix * Revert "[SPON-15] fix wrong suffix" This reverts commit 98910392d91c26cd0454cca8cfc03c4e3d417fd6. * fix mixinjson suffix * use stream instead of collection for mixin json name * change name for function * use correct auto-refmap * fix file name * add with action * add test * refactor some codes * refactor code * update test * fix checkstyle * better error message * fix checkstyle * remove corss project option * allow mixin inside loom * remove project0 I should remove all project0. If I forget one please tell me. * move `mixin` inside `loom` * fix spotless * merge attempt * fix checkstyle * seperate api & impl * add experimental annotation for API * use API * Fix indentation Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> * fix typo Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> * fix typo Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> * better javadoc Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
2021-07-14Split Minecraft and Forge jars (#34)shedaniel
* Split Forge & Minecraft jars, WIP! Signed-off-by: shedaniel <daniel@shedaniel.me> * Properly remap Signed-off-by: shedaniel <daniel@shedaniel.me> * Use async Signed-off-by: shedaniel <daniel@shedaniel.me> * Change configurations Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-14Refactor LoomGradleExtension (#431)modmuss50
* First pass at refactoring the extension * Fix inital issues. * Combine some interfaces * Checkstyle * Fix years * Add isShareCaches to api
2021-07-13Fix license headersshedaniel
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-13Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9shedaniel
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-10Fix local file mod dependencies (#430)Juuxel
* ModProcessor: Add more descriptive error TR output error message * Fix flatDir/files/fileTree mod dependencies * Add clarifying comment * Use hash as a placeholder version * ProjectTestTrait: Copy instead of reading and writing text This allows having jars and other binary data in tests. * Add integration test for local file dependencies * Use File.bytes instead of Files.copy * Use truncated SHA256 instead of murmur3
2021-07-10Use spotless for header validation, years have been back-filled from git historymodmuss50
2021-06-03Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8shedaniel
2021-06-01Fix MergedNestedJarProvider not calling the child's preparemodmuss50
2021-05-30Update tiny-remapper to 1.1.0shedaniel
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-30Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8shedaniel
# Conflicts: # .github/workflows/test-push.yml # build.gradle # settings.gradle # src/test/groovy/net/fabricmc/loom/test/integration/dependencyResolutionManagement.groovy
2021-05-22Add classifier to "fake" mods' id if they have a classifier specified (#394)Mitchell Skaggs
* Remove unused codepath (`RemapJarTask` is an `AbstractArchiveTask`) * Remove incorrect comment Comment originally added in 02e9616622abed6b266ced329b86d419ac31ee88 * Add classifier to `DependencyInfo` * Add classifier to generated mod ID * Clean up code structure from review Co-authored-by: haykam821 <haykam821@users.noreply.github.com> * Inline `file` local variable Co-authored-by: haykam821 <haykam821@users.noreply.github.com> Co-authored-by: haykam821 <haykam821@users.noreply.github.com>
2021-05-14Fix merge conflictsshedaniel
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-14Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8shedaniel
# Conflicts: # README.md # build.gradle # src/main/java/net/fabricmc/loom/LoomGradlePlugin.java # src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java # src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java # src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java # src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java # src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java # src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
2021-05-13General cleanup by making use of java 16 features (#397)modmuss50
* General cleanup by making use of java 16 features * use jackson-databind in place of gson when reading to a record * Fixes * cleanup * dep updates * Replace commons IOUtils usage with native java * Update fernflower
2021-05-12Merge remote-tracking branch 'architectury/dev/0.7-forge' into dev/futureshedaniel
2021-05-10Merge remote-tracking branch 'architectury/dev/0.6-forge' into dev/0.7-forgeshedaniel
# Conflicts: # build.gradle # src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
2021-05-10Add detection for "architectury.common.marker" to remapshedaniel
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-05Adds Forge Sources Remappingshedaniel
Filter ':launcher' dependency (Could cause problems! Please test!) Fix previous optimisations leaving signing info in Add license header to various files Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-05Merge remote-tracking branch 'FabricMC/future/dev' into dev/futureshedaniel
# Conflicts: # .github/workflows/test-push.yml # src/main/java/net/fabricmc/loom/LoomGradleExtension.java # src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java # src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
2021-05-04Make remapped configurations lazymodmuss50
2021-05-01ashedaniel
2021-04-30Workaround for FileSystemAlreadyExists errors (#17)Username404-59
2021-04-17Merge remote-tracking branch 'architectury/dev/0.6-forge' into dev/0.7-forgeshedaniel
2021-04-14Add more logging to JarRemappershedaniel
2021-04-14Add "loom.forge.include" for include configuration on forgeshedaniel
2021-04-13Simplify RemapJarTask remapRefmapshedaniel
2021-04-13Simplify RemapJarTask remapRefmapshedaniel
2021-04-04Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forgeshedaniel
# Conflicts: # .github/workflows/test-push.yml # build.gradle # src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java # src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java # src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java # src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java # src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java # src/main/java/net/fabricmc/loom/configuration/providers/minecraft/assets/MinecraftAssetsProvider.java # src/main/java/net/fabricmc/loom/decompilers/fernflower/AbstractFernFlowerDecompiler.java # src/main/java/net/fabricmc/loom/decompilers/fernflower/ForkingJavaExec.java # src/main/java/net/fabricmc/loom/task/RemapJarTask.java # src/main/java/net/fabricmc/loom/util/GroovyXmlUtil.java # src/main/java/net/fabricmc/loom/util/HashedDownloadUtil.java # src/test/groovy/net/fabricmc/loom/BuildUtils.groovy