Commit Graph

874 Commits

Author SHA1 Message Date
shedaniel
dd5e6df3ae Fix merge conflicts
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-14 06:56:18 +08:00
shedaniel
ec2b47fa14 Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8
# 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-14 06:43:07 +08:00
shedaniel
7d38e3bc9a Merge remote-tracking branch 'FabricMC/future/dev' into dev/0.8 2021-05-14 06:40:13 +08:00
modmuss50
9fb167d506 General cleanup by making use of java 16 features (#397)
* 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-13 22:06:34 +01:00
modmuss50
2f38c747a1 Catch all when merging jars 2021-05-12 20:31:05 +01:00
modmuss50
258578f142 Update MCE to 0.4.3 2021-05-12 20:08:55 +01:00
modmuss50
432e88f354 Add a simple java 16 project test 2021-05-12 19:03:59 +01:00
modmuss50
9303dc39c3 Cleanup merged jar on failure 2021-05-12 19:03:42 +01:00
modmuss50
943477143a Update stitch 2021-05-12 19:03:22 +01:00
modmuss50
429d2dadb1 Start 0.8 dev cycle 2021-05-12 16:24:06 +01:00
modmuss50
63bf3aaaa4 Enable ShowCodeDetailsInExceptionMessages (Better null pointers) for all run configs 2021-05-12 16:01:00 +01:00
shedaniel
04fdf68d99 There is nothing lazy about this that makes this a lazy configuration
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-12 21:49:59 +08:00
shedaniel
85960a164a Merge remote-tracking branch 'FabricMC/future/dev' into dev/future
# Conflicts:
#	.github/workflows/test-push.yml
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
2021-05-12 21:44:59 +08:00
shedaniel
855836b972 Merge remote-tracking branch 'architectury/dev/0.7-forge' into dev/future 2021-05-12 21:43:28 +08:00
modmuss50
fc3a5ef052 Java 16 2021-05-12 14:03:45 +01:00
shedaniel
7f32844bdb Don't remap forge sources on a CI build
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-11 00:57:03 +08:00
shedaniel
3ae05747f5 Merge remote-tracking branch 'architectury/dev/0.6-forge' into dev/0.7-forge
# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
2021-05-10 23:13:25 +08:00
shedaniel
3364e7ae64 Add detection for "architectury.common.marker" to remap
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-10 23:12:54 +08:00
shedaniel
5c267250da Merge pull request #19 from architectury/feature/field-migration
Field Migration Mappings
2021-05-09 00:02:25 +08:00
shedaniel
60b10a53ab Bump to 0.7.2 2021-05-09 00:02:12 +08:00
shedaniel
8ef33a9d5e Add license
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-08 19:50:58 +08:00
shedaniel
9d19ab4c2e Small cleanup + Use MappingsUtils for reordering
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-08 19:15:21 +08:00
shedaniel
017e09cf52 Fix jar output location
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-08 19:14:11 +08:00
shedaniel
3570137e07 Setup empty launch settings
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-08 17:25:47 +08:00
shedaniel
3f576a44ab Migration Mappings Detection
Still having issues with source locations, would need to check it out first

Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-08 12:50:17 +08:00
shedaniel
d91d7c096c Revert "Filter ':launcher' dependency (Could cause problems! Please test!)"
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-05 21:42:03 +08:00
shedaniel
2625b90a17 Adds Forge Sources Remapping
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-05 18:29:42 +08:00
modmuss50
927180e36b Make all loom added configurations lazy 2021-05-04 20:06:24 +01:00
modmuss50
f4f660dce5 Fix typo 2021-05-04 19:40:51 +01:00
shedaniel
68028031ba Merge remote-tracking branch 'architectury/dev/0.7-forge' into dev/future 2021-05-05 02:37:40 +08:00
shedaniel
8d96bc0b6f Use "loom.platform" instead of "loom.forge"
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-05 02:34:03 +08:00
shedaniel
433609dae0 Merge remote-tracking branch 'architectury/dev/0.7-forge' into dev/future 2021-05-05 02:27:49 +08:00
shedaniel
41b631f8d6 Version 0.7.1, Merge pull request #15 from architectury/feature/perf
Performance Optimisations on Project Setup
2021-05-05 02:27:29 +08:00
shedaniel
aba834b040 Merge remote-tracking branch 'FabricMC/future/dev' into dev/future
# 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-05 02:21:49 +08:00
shedaniel
f0ec1b61dd Merge remote-tracking branch 'FabricMC/future/dev' into dev/future
# Conflicts:
#	.github/workflows/publish.yml
#	.github/workflows/test-push.yml
#	build.gradle
#	src/main/java/net/fabricmc/loom/util/Constants.java
#	src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
2021-05-05 02:20:20 +08:00
modmuss50
7ce072c47a Fix gradle 8 deprecation warning 2021-05-04 19:19:02 +01:00
modmuss50
a5bc38a940 Make remapped configurations lazy 2021-05-04 19:07:21 +01:00
modmuss50
891870584d Fix actions 2021-05-04 18:45:57 +01:00
modmuss50
cd17485280 Update to release 7.0 gradle 2021-05-04 18:37:23 +01:00
modmuss50
be0444d261 Merge branch 'dev/0.7' into future/dev
# Conflicts:
#	src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
2021-05-04 18:29:00 +01:00
shedaniel
6b9f9bb06b Merge remote-tracking branch 'architectury/dev/0.7-forge' into feature/perf
# Conflicts:
#	build.gradle
2021-05-05 00:29:11 +08:00
shedaniel
43a082597d Migrate to "org.codehaus.groovy:groovy" and change repo order
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-05 00:23:31 +08:00
shedaniel
f0227044b3 Merge remote-tracking branch 'FabricMC/dev/0.6' into dev/0.7-forge 2021-05-05 00:09:13 +08:00
shedaniel
da286b6c86 Change plugin ID to "dev.architectury.loom" 2021-05-03 18:40:02 +08:00
shedaniel
24d4043764 Bump to 0.7.1 & Update mercury 2021-05-03 18:36:55 +08:00
shedaniel
4c71989d2d Remove mavenLocal() 2021-05-02 00:37:26 +08:00
shedaniel
6f2ec219e7 Use TinyRemapper directly 2021-05-01 21:16:42 +08:00
shedaniel
77e71acd99 a 2021-05-01 19:40:27 +08:00
shedaniel
c28fe56870 Merge remote-tracking branch 'architectury/dev/0.7-forge' into feature/perf 2021-04-30 10:38:28 +08:00
shedaniel
73dbebbf95 Add --stacktrace 2021-04-30 10:06:42 +08:00