442 Commits

Author SHA1 Message Date
Juuz
f51a9a59de Merge remote-tracking branch 'upstream/dev/1.3' into dev/1.3
# Conflicts:
#	src/main/java/net/fabricmc/loom/build/nesting/IncludedJarFactory.java
2023-07-19 12:56:27 +03:00
Juuz
2de23d12cf Update TR and fix compilation errors 2023-07-19 12:14:34 +03:00
modmuss50
cfe72b933a Improve Kotlin version detection 2023-07-06 13:06:07 +01:00
Juuz
60e0aaf823 Merge remote-tracking branch 'upstream/dev/1.3' into dev/1.3
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
2023-06-30 16:23:49 +03:00
modmuss
a2b541818c Apply AW as a TR AnalyzeVisitor (#892)
* Apply AW as a TR AnalyzeVisitor

* Update TR
2023-06-23 15:29:24 +01:00
Juuz
13cfbb9da5 Merge remote-tracking branch 'upstream/exp/1.3' into exp/1.3
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftJarConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/IntermediaryMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/NamedMinecraftProvider.java
#	src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
2023-06-21 21:40:25 +03:00
modmuss
4e593fc5ae Rework how unpick and linenumber maps are applied (#907)
This should hopefully vastly improve debugging, and more imporantly not work in a consistant manner, making debugging issues a lot easier.

This commit contains an intergration test that uses a real debugger to check that breakpoints are being fired as expected.
2023-06-16 21:55:04 +01:00
modmuss
856f0a4f33 Fix and validate kotlin version. (#903) 2023-06-13 18:31:02 +01:00
modmuss50
5c92ebd20b Loom 1.3 2023-06-13 11:10:08 +01:00
Juuz
915521cd23 Fix code style 2023-04-30 02:46:15 +03:00
Juuz
bf707bd5eb Disable FabricAPITest in CI since it never completes 2023-04-29 22:38:52 +03:00
Juuz
27cfb8c033 Merge 1.2, part 2 2023-04-23 10:35:54 +03:00
Juuz
4b2090f6fe Merge 1.2, part 1 2023-04-23 10:30:30 +03:00
modmuss50
89d09600c5 Rewrite Kotlin metadata remapping to support the latest kotlin metadata library. (#866) 2023-04-17 23:46:45 +01:00
modmuss50
1015ef09ff Update to Gradle 8.1 (#864)
* Update to Gradle 8.1

* Fix build, run RunConfigTest against all gradle versions.

* Fix build
2023-04-17 13:49:49 +01:00
modmuss50
95a260d923 Test against Gradle 8.1 and 8.2 nightly. (#846) 2023-04-16 17:19:21 +01:00
modmuss50
9e7458f76a 1.2 2023-04-16 14:46:50 +01:00
Juuz
5b1c18b3c1 Fix code format
Also replaced some Groovy 3 syntax with Groovy 2 syntax because
Eclipse is bad and outdated as usual.
2023-04-03 18:00:31 +03:00
Juuz
b7b5d5023e Merge remote-tracking branch 'upstream/dev/1.1' into dev/1.1
# Conflicts:
#	build.gradle
#	src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy
#	src/test/groovy/net/fabricmc/loom/test/unit/kotlin/KotlinRemapperClassloaderTest.groovy
#	src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
#	src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/MojangMappingLayerTest.groovy
#	src/test/resources/projects/dependencyResolutionManagement/settings.gradle
2023-04-03 17:43:30 +03:00
modmuss50
ad7d4e75b9 Reformat groovy code (#850)
* Reformat groovy

* Also format gradle files

* Groovy import order
2023-03-31 10:22:58 +01:00
Juuz
674572f1df Add actual mods.toml metadata parsing 2023-02-19 02:36:11 +02:00
Juuz
b8a2828582 Tweak publications to match upstream more closely
- Removes one duplicate publication (plugin), it already exists in the
  gradle plugin development plugin.
- Removed some minor differences in the snapshot publications to match
  upstream to reduce merge conflicts.
2023-02-18 18:22:21 +02:00
Juuz
9e041899ae Merge with Fabric 1.1, stage 9 2023-02-16 21:03:55 +02:00
Juuz
16e1eda2c6 Merge with Fabric 1.1, stage 7 2023-02-16 20:59:03 +02:00
Juuz
0314829e26 Merge with Fabric 1.1, stage 3 2023-02-16 01:02:58 +02:00
Juuz
4e9b50fcbc Merge with Fabric 1.1, stage 2 2023-02-16 01:00:05 +02:00
Juuz
81d1f5d562 Merge with Fabric 1.1, stage 1 2023-02-16 00:53:48 +02:00
modmuss50
b22c66f0be Update dependencies 2023-01-22 13:34:28 +00:00
js6pak
8a434af084 Remove unnecessary publication (#619) 2023-01-16 19:09:06 +00:00
modmuss50
63ecb88082 Gradle 8 tests, perf/memory optimisations (#796)
* Add gradle 8 tests
Reuse gradle home between tests
Misc perf and mem optimisations

* Fix build warning.

* Added multi mc version test

* Use server launcher in ServerRunner

Co-authored-by: Luna <62033805+Luna5ama@users.noreply.github.com>
2023-01-16 18:39:26 +00:00
Juuz
cf68a6eb1e Merge remote-tracking branch 'upstream/dev/1.0' into dev/1.0 2023-01-16 19:56:25 +02:00
Juuz
f2c0d7a35d Split Architectury extensions to Fabric classes into new classes (#116)
* Split custom RemapJarTask logic into a new class

* Split a lot of logic for Arch and Quilt mod metadata into new classes

* ArchitecturyCommonJson: Fix outdated error message

* Add minimal unit tests for ACJ and QMJ

* QuiltModJson: Fix error when there are no injected interfaces

* QuiltModJsonTest: Add test for mixin configs

* QuiltModJsonTest: Move to correct package

* Add tests for creating ACJ and QMJ instances
2023-01-07 01:51:32 +02:00
modmuss50
b79b64298b Update mercury (#777) 2022-12-18 15:59:53 +00:00
modmuss50
e16d9b0fa2 Update mercury, use the java release version to set the merucry source compat version (#773) 2022-12-16 10:48:58 +00:00
modmuss50
b4155a9450 Small build updates.
Java toolchains aren't support on ARM64 windows. Waiting on https://github.com/gradle/gradle/issues/21703
2022-11-01 21:49:22 +00:00
Juuz
1dc04a7b3a Remove unused buildNum property from build.gradle 2022-10-30 11:23:42 +02:00
Juuz
65cca62114 Update base version to 1.0 2022-10-30 11:22:46 +02:00
modmuss50
c46abf8ac4 Update deps, test fixes, and fix github actions deprecation warnings. (#745) 2022-10-29 16:57:06 +01:00
Juuz
992e8d2a8e build.gradle: Replace System.getenv with ENV map for cleaner merges 2022-10-29 14:24:59 +03:00
Juuz
515e1113c2 Merge remote-tracking branch 'upstream/dev/1.0' into dev/1.0
# Conflicts:
#	.github/workflows/test.yml
#	build.gradle
2022-10-29 13:54:39 +03:00
modmuss50
a3c64d5301 Update Fernflower, CFR and Mercury (JDT) (#723) 2022-10-26 12:55:22 +01:00
modmuss50
fccb667212 Bump version to 1.1 2022-10-26 12:46:44 +01:00
modmuss50
57b5f05c57 Fix support for latest Gradle 8.0 nightly. (#732)
* Fix support for Gradle 8.0.

* Cleanup

* Fix another gradle 8 issue?
2022-10-02 16:28:55 +01:00
Juuz
ffe5e955c5 Fix test artifact names (#716)
* Fix test artifact names

- Fixes empty parens in Linux artifacts
- Fixes invalid artifact names containing *
- Fixes Windows artifacts not being different from Linux ones

* Fix Windows tests
2022-09-11 20:26:00 +01:00
modmuss50
35e32e89f3 Retry failed tests. (#721)
* Retry failed tests.

* Minor updates.
2022-09-11 20:25:49 +01:00
Juuz
f905a2a17c Disable test parallelisation to fix DownloadTests 2022-09-11 21:09:40 +03:00
Juuz
c549c5fd7a Create test report (#102) 2022-09-08 03:59:29 +03:00
Juuxel
ea9dc0baa5 Add genForgePatchedSources task (#98)
* Add genForgePatchedSources task

Closes #32. Also reworks the MCP executor system quite heavily:

- Instead of executing all steps up to `x`, it now resolves dependencies based on step inputs
- No-op steps are skipped
- Steps can be overridden with custom logic by callers
- You can add multiple desired steps to one round of execution
- All step types in MCPConfig 1.14-1.19 are supported now
- Variables that reference MCPConfig zip contents now work
  - Removed special case for `{mappings}` variable

Other:
- the MCPConfig zip is now completely extracted into the cache dir instead of just the config file
2022-09-07 15:36:05 +03:00
Juuz
0477a37e6a Merge remote-tracking branch 'upstream/dev/1.0' into dev/1.0
# Conflicts:
#	build.gradle
2022-09-06 22:49:57 +03:00
modmuss50
c5def7a594 Replace library used for download progess tracking.
This fixes the outdated java warning pre Java 11.
2022-08-31 19:45:33 +01:00