Commit Graph

45 Commits

Author SHA1 Message Date
Juuz
96b1497f29 Merge remote-tracking branch 'upstream/exp/1.12' into exp/1.12
# Conflicts:
#	build.gradle
#	gradle/runtime.libs.versions.toml
#	src/main/java/net/fabricmc/loom/build/nesting/JarNester.java
#	src/main/java/net/fabricmc/loom/build/nesting/NestableJarGenerationTask.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModConfigurationRemapper.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/tiny/MappingsMerger.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/extension/MixinExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java
#	src/main/java/net/fabricmc/loom/task/service/LorenzMappingService.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
2025-10-01 01:09:17 +03:00
modmuss
cf42acf09f Remove Guava and Commons IO Dependencies (#1372) 2025-09-27 09:06:29 +01:00
Juuz
fe2c21c0ad Merge 1.11 2025-08-18 13:13:31 +03:00
modmuss
88dba47e5d Add custom mappings support to abstract remap jar task. (#1297)
* Add custom mappings support to abstract remap jar task.

Closes #1296

* Fix build
2025-04-28 22:09:45 +01:00
Juuz
09174f0ad3 Merge 1.9 2024-12-06 19:35:18 +02:00
Juuz
2cc6e59f60 Merge 1.8, part 6 2024-12-06 19:26:31 +02:00
Juuz
a68e671678 Merge 1.8, part 4 2024-12-06 19:21:07 +02:00
shedaniel
c839826f09 Merge commit '9157c22448cb4847586772f8028010f717accc14' into dev/1.8 2024-11-16 20:23:13 +08:00
shedaniel
24e5aeb201 Merge commit '3c3225900123390868a718f5553d552bd0385000' into dev/1.8 2024-11-16 19:27:08 +08:00
modmuss
e387514ff7 Update to Gradle 8.11 (#1214)
* Update to Gradle 8.11

* Fix 8.12 producing empty outputs

* More 8.12 fixes
2024-11-14 18:44:05 +00:00
modmuss
5f9f087ff7 Rewrite migrate mappings task to be configuration cache compatible. (#1167) 2024-09-07 12:50:20 +01:00
modmuss
f3a9a49c6f Enable configuration cache for most tests by default (#1162)
* Enable configuration cache for all tests by default

* Support config cache in test projects

* Some config cache test fixes

* Config caching for run game tasks

* Problems for later

* More problems for later

* Bump min idea version, and remove version check.

* Untested client entries service

* Fixes
2024-08-30 14:39:48 +01:00
modmuss
9157c22448 Inital remap jar configuration cache support (#1161)
* Move everything to the new service system

* Checkstyle

* Fix unit tests + make them use the internet less

* Some more fixes

* Split the mixin ap mapping handling out into its own service.

* Checkstyle

* Fixes

* Move mixin refmap handling to a service

* Minor changes
2024-08-20 12:51:47 +01:00
modmuss
b533dacba8 Remove multi project optimisation (#1159)
* Remove multi project optimisation

* Fix build

* Fix FAPI test
2024-08-14 10:59:18 +01:00
Jab125
9e4a70f742 Fix Forge 50 (1.20.6) (#219)
Co-authored-by: shedaniel <daniel@shedaniel.me>
Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
2024-07-01 20:04:40 +03:00
shedaniel
beb04d30f2 Merge remote-tracking branch 'FabricMC/exp/1.5' into exp/1.5
# Conflicts:
#	.github/workflows/publish.yml
#	gradle/libs.versions.toml
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/build/nesting/IncludedJarFactory.java
#	src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/tiny/TinyJarInfo.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/ProcessedNamedMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
#	src/test/groovy/net/fabricmc/loom/test/unit/kotlin/KotlinRemapperClassloaderTest.groovy
2023-12-26 18:39:12 +08:00
modmuss50
6452509ec5 Optimise IncludedJarFactory & ZipReprocessorUtil
No longer processes the jar multiple times, caches the jar in place.

ZipReprocessorUtil now directly writes the file to disk, instead of first copying it to memory.
2023-12-20 16:58:51 +00:00
shedaniel
e3c5226da7 Merge remote-tracking branch 'FabricMC/exp/1.5' into exp/1.5
# Conflicts:
#	gradle/libs.versions.toml
#	src/main/java/net/fabricmc/loom/configuration/mods/ArtifactMetadata.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModConfigurationRemapper.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/task/RemapJarTask.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
#	src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy
2023-11-22 14:56:39 +08:00
modmuss
99380d98e5 Add Fabric-Loom-Mixin-Remap-Type manifest entry (#980) 2023-11-20 15:19:48 +00:00
Jason Penilla
f63a4f4d25 Skip remapping in AbstractRemapJarTasks when source and target namespaces match (#985)
* Skip remapping in `AbstractRemapJarTask`s when source and target namespaces match

The "remap jar" tasks have much more functionality than simply remapping jars at this point, such as adding namespace metadata, nesting jars, ensuring reproducible builds, etc. Some custom build logic may want to take advantage of these features without the full overhead of no-op remapping with TinyRemapper/Mercury.

* Add test
2023-11-20 10:35:46 +00:00
shedaniel
649bbcaf55 Merge remote-tracking branch 'upstream/exp/1.4' into exp/1.4
# Conflicts:
#	.gitignore
#	build.gradle
#	settings.gradle
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/task/service/JarManifestService.java
#	src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
2023-09-23 16:11:29 +08:00
modmuss50
0b36121357 Add Fabric-Jar-Type to jar manifest.
Either 'classes' or 'sources', the idea is mod distribution platforms can check that sources jars are not uploaded accidentally.

Closes #939
2023-09-11 11:47:19 +01:00
modmuss50
4caf4f831e Sort client only entries, fixes #940 2023-09-09 17:31:43 +01:00
modmuss
ae159dd126 Support Zip.getEntryCompression() setting (#936)
* Support Zip.getEntryCompression() setting

* Checkstyle

* Set for both the entry and ZOS
2023-09-09 13:21:43 +01:00
Juuz
1d6d7b5489 Merge commit 'af21d602' into exp/1.1 2023-02-16 20:46:17 +02:00
Juuz
0314829e26 Merge with Fabric 1.1, stage 3 2023-02-16 01:02:58 +02:00
Juuz
81d1f5d562 Merge with Fabric 1.1, stage 1 2023-02-16 00:53:48 +02:00
modmuss50
2c6d4d930f Add getClientOnlySourceSetName (#770) 2022-12-30 13:06:12 +00:00
modmuss50
39be6fa6e0 Merge remote-tracking branch 'origin/dev/1.0' into exp/1.1
# Conflicts:
#	src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java
#	src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java
2022-12-11 20:31:07 +00:00
Juuz
8dad64dc66 Merge remote-tracking branch 'upstream/dev/1.0' into dev/1.0 2022-12-11 15:40:24 +02:00
modmuss50
7173c2a6cb Add AbstractRemapJarTask.getAdditionalClientOnlyEntries 2022-11-21 19:24:21 +00:00
modmuss50
f87320fae8 Add multi project optimisation option to allow opt into shared tiny remapper. (#747)
* Add multi project optimisation option to allow opting into shared tiny remapper.

* Review feedback and fixes
2022-11-01 21:36:41 +00:00
modmuss50
cc43cfc1dc Major steps towards config caching support :) 2022-10-06 21:42:45 +01:00
Juuz
58f2f9445e Merge with Fabric 0.13, stage 3 2022-08-09 17:26:18 +03:00
Juuz
48126bd5d6 Merge with Fabric 0.13, stage 1 2022-08-09 17:18:43 +03:00
modmuss50
35d37def55 Add JarSplitter.
Still needs writing up.
2022-07-03 15:07:13 +01:00
modmuss50
317c6daedd Apply the same manifest attributes to the sources jar. Including a list of client only entries.
Will be used to split the sources into client/common jars in a later change.
2022-06-20 21:11:11 +01:00
Juuz
4d042cd4a5 Fix mixin refmap generation on Forge 2022-05-17 21:46:36 +03:00
Juuz
3b9058f64b Set AbstractRemapJarTask.remapperIsolation default value to true
This matches what we did before.
2022-01-27 19:57:56 +02:00
Juuz
0f73e65a59 Merge remote-tracking branch 'upstream/dev/0.11' into dev/0.11.0
# Conflicts:
#	src/main/java/net/fabricmc/loom/task/AbstractRemapJarTask.java
#	src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
2022-01-27 19:56:59 +02:00
Juuz
3d5f61321b Revert "Workaround FabricMC/fabric-loom#587"
This reverts commit 3953aeda52.
2022-01-27 19:55:23 +02:00
modmuss50
4fe19028cf Add option to isolate the tiny remapper instance between sub-projects. (#588) 2022-01-27 17:08:17 +00:00
shedaniel
3953aeda52 Workaround FabricMC/fabric-loom#587
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-01-27 20:58:18 +08:00
shedaniel
874671eb7f Fix merge conflicts, it compiles, but shouldn't work
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-01-06 16:03:03 +08:00
modmuss50
ab21e0e550 Rewrire Jar and Source remapping tasks. (#504) 2021-12-20 16:29:11 +00:00