Commit Graph

1983 Commits

Author SHA1 Message Date
shedaniel
3347cfdd4a Merge remote-tracking branch 'FabricMC/exp/1.6' into exp/1.6
# Conflicts:
#	.github/workflows/publish.yml
#	build.gradle
#	gradle/libs.versions.toml
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/ifaceinject/InterfaceInjectionProcessor.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
#	src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java
#	src/test/resources/projects/kotlin/build.gradle.kts
2024-02-29 18:57:33 +09:00
shedaniel
5c8405f0a9 Merge remote-tracking branch 'FabricMC/dev/1.5' into dev/1.5 2024-02-29 18:40:59 +09:00
FirstMegaGame4
ae1ba0ab86 Injected Interfaces, Generics Support (#1050) 2024-02-25 15:26:00 +00:00
modmuss
3085bcfb56 Fix deprecation warning in Gradle 8.7 (#1056) 2024-02-25 13:31:58 +00:00
modmuss
0dc1ba012a Update deps (#1054) 2024-02-24 15:04:56 +00:00
modmuss50
cfba0b18cd Update wrapper validation task 2024-02-19 22:10:38 +00:00
modmuss50
7904141677 Prevent Gradle from running vscode task asynchronously
Closes #1048
2024-02-19 22:02:24 +00:00
Jason Penilla
1412f65e10 Print info about process lock owner (#1040)
* Print info about process lock owner

* format

* Fix extraneous space with empty args

* Avoid leaking sensitive info in program arguments by default

* fix indent

* switch var usage around
2024-02-19 18:35:58 +00:00
modmuss
9ea10ff759 Add Offline mode / locking test (#1046)
* Add Offline mode / locking test

* Fix

* Make offline tests more resilient
2024-02-19 18:35:43 +00:00
modmuss
f0df5a5a71 Add interface injection unit test (#1052)
* Add interface injection unit test

* Cleanup and fixes
2024-02-19 15:06:33 +00:00
Jason Penilla
910963a81c Download intermediary using Gradle (#1042)
* Download intermediary using Gradle

* address review

* Remove ApiWrapper

* Use detached configuration
2024-02-08 22:20:10 +00:00
Jason Penilla
2a385b3e2b Improve locking strategy for concurrent loom executions (#1031)
* Improve locking strategy for concurrent loom executions

This is especially useful for when IntelliJ decides to randomly sync the
Gradle project while I am running Gradle from the command line already.

* Fix style violations

* Adjust feedback messages and use Duration for timeout

* Fixup message
2024-02-03 23:33:28 +00:00
modmuss50
b2376a0981 Fallback to maven central for artifacts such as sources or javadocs that are not mirrored on Mojang's repo.
Fixes #1032
2024-02-03 23:30:13 +00:00
modmuss
8250b509a4 Prepare for SelfResolvingDependency's removal & Update to Gradle 8.6 (#1038)
* Prepare for SelfResolvingDependency's removal
Update to Gradle 8.6

* Update docker images

* ProjectDependency is also a SRD

* Throw if layered mappings are created too late.
2024-02-03 23:26:33 +00:00
modmuss50
f26c49c36f Disable DebugLineNumbersTest in CI tests. 2024-02-03 23:25:06 +00:00
modmuss50
ac3fa8d410 Start on Loom 1.6 2024-02-02 18:16:46 +00:00
shedaniel
20b639666c Set refmap remap type for neoforge and don't hardcode the mixin ext for neoforge deps 2024-01-26 15:31:07 +09:00
shedaniel
2a243b290c Remove build number step 2024-01-26 15:29:49 +09:00
shedaniel
b07102b305 Merge remote-tracking branch 'FabricMC/dev/1.5' into dev/1.5 2024-01-26 15:28:49 +09:00
shedaniel
201600978b Publish Loom 1.5 Betas 2024-01-26 01:07:35 +09:00
modmuss50
297b7f90e9 Fix split decompile task name. Closes #1029 2024-01-25 08:49:25 +00:00
Juuz
26987212ad Merge branch 'dev/1.4' into dev/1.5 2024-01-24 20:15:42 +02:00
Juuz
483f2926e1 DependencyDownloader: Remove debug logging 2024-01-24 20:15:30 +02:00
Juuz
5135aaae38 Merge branch 'dev/1.4' into dev/1.5 2024-01-24 20:07:19 +02:00
Juuz
fcd0701a5b Upgrade Log4J version used by AT tool 2024-01-24 20:06:32 +02:00
Juuz
dfbdf26678 DependencyDownloader: Support platform dependencies 2024-01-24 20:05:25 +02:00
Juuz
f1df58a5f3 Revert "DependencyDownloader: Upgrade (transitive) Log4J if needed"
This reverts commit acd9ad739b.
2024-01-24 19:56:07 +02:00
Juuz
275cf41be5 SrgMergerTest: Adapt to MIO update 2024-01-24 16:04:03 +02:00
Juuz
db73ac982f Merge branch 'dev/1.4' into dev/1.5 2024-01-24 13:23:33 +02:00
Juuz
acd9ad739b DependencyDownloader: Upgrade (transitive) Log4J if needed 1.4 2024-01-24 13:22:35 +02:00
modmuss
5d2b75dc1d Remapper extension improvements (#1024)
* Remapper extension improvements

* Fix

* Fix generics
2024-01-16 16:27:51 +00:00
shedaniel
18945edb2e Fixes some tests 2024-01-16 17:13:01 +09:00
modmuss50
255b3b2b88 Fix #1023
Just a quick fix for now, might look into why its broken in 1.6
2024-01-13 10:58:08 +00:00
shedaniel
fb49f1516f Don't fail for Loom 1.5 built artifacts 2024-01-12 15:03:27 +09:00
modmuss50
615b81641c Don't apply loom-native-support when LWJGL is upgraded to support Java 19+.
Fixes a crash in 1.20.1, when using Java 21
2024-01-10 21:45:36 +00:00
shedaniel
ec73ad52ec Mark as beta 2024-01-10 22:35:32 +09:00
shedaniel
70e9b8c563 Merge remote-tracking branch 'origin/dev/1.4' into dev/1.5 2024-01-10 22:35:20 +09:00
shedaniel
a85428d43b Fix compile errors 2024-01-10 22:35:12 +09:00
shedaniel
b3d2e349f5 Fix checkstyle 2024-01-10 22:33:19 +09:00
shedaniel
39e23837e5 Merge remote-tracking branch 'origin/dev/1.4' into dev/1.5
# Conflicts:
#	gradle/libs.versions.toml
2024-01-10 22:28:25 +09:00
shedaniel
c5a1a2d6b2 Merge remote-tracking branch 'FabricMC/dev/1.5' into dev/1.5
# Conflicts:
#	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/task/service/TinyRemapperService.java
#	src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy
2024-01-10 22:27:36 +09:00
shedaniel
36ec0dc99d Remove beta warning 2024-01-10 22:22:46 +09:00
shedaniel
0446bbfef2 Merge remote-tracking branch 'FabricMC/dev/1.4' into dev/1.4 2024-01-10 22:21:27 +09:00
modmuss
480dd5e393 Some minor peformance improvements (#1019) 2024-01-06 17:17:26 +00:00
Jason Penilla
8df229313e Cache FMJs and ArtifactMetadata when reading during configuration time (#1018)
We have to read every jar on remapped configs to see if they are a mod or should otherwise be remapped. By caching we can avoid re-reading jars that are java-runtime & java-api or are on multiple remapped configs. The cache scope could probably be widened to help more with multi-project builds, but I am leaving that for future work as I think it would also require some sort of invalidation.
2024-01-05 18:35:39 +00:00
modmuss50
c52f868af4 Revert checkstyle update for now. 2024-01-04 14:43:50 +00:00
modmuss
a0aa6eafb2 Validate jar and fail if it was built with Loom 1.5 or later. (#988) 2024-01-04 14:15:15 +00:00
modmuss50
793388cbfb Update libs 2024-01-04 14:07:12 +00:00
modmuss
872d12ace0 Update tiny-remapper, misc perf improvements, test fixes. (#1009)
* Only mixin remap/analyse classpath jars that use static mixin remappings.

* More of a mess

* Less of a mess?

* Nope?

* Exclude the none root MC jars from the remap classpath when using MPO

* Improve test a little

* Update TR

* Checkstyle

* Fix DLN test

* Fix possible crash when closing build services
2024-01-04 00:39:36 +00:00
modmuss
c5d73548e7 Remove jackson (#1014)
* Remove jackson

* Fix unit tests
2024-01-02 22:35:37 +00:00