imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-03 05:57:42 -05:00
Code Issues Packages Projects Releases Wiki Activity
894 Commits 46 Branches 9 Tags
1212e56d9ccf6e6025cba3b5bbd8175e45c1ac27
Commit Graph

754 Commits

Author SHA1 Message Date
shedaniel
1212e56d9c Detect tsrg2 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-06-05 01:55:26 +08:00
shedaniel
58347914b5 Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8 2021-06-03 23:18:37 +08:00
modmuss50
4763760984 Revert "Update mercury (#408)" 
This reverts commit 50d6fd298d.
 2021-06-02 23:05:51 +01:00
modmuss50
50d6fd298d Update mercury (#408) 2021-06-02 09:06:26 +01:00
modmuss50
188bbe57d6 Fix MergedNestedJarProvider not calling the child's prepare 2021-06-01 18:13:59 +01:00
shedaniel
b4b2e986d1 Reinitiate the forge repo 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-30 20:47:03 +08:00
shedaniel
6bdfabc228 Update tiny-remapper to 1.1.0 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2021-05-30 19:57:35 +08:00
shedaniel
a4c72b6f03 Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8 
# Conflicts:
#	.github/workflows/test-push.yml
#	build.gradle
#	settings.gradle
#	src/test/groovy/net/fabricmc/loom/test/integration/dependencyResolutionManagement.groovy
 2021-05-30 19:17:56 +08:00
modmuss50
210938d749 Fix local ivy layout not respecting classifiers. Fixes #407 2021-05-28 11:31:19 +01:00
modmuss50
3318a15cc5 Suppress "Inconsistent inner class entries" error when decompiling 2021-05-27 22:08:56 +01:00
modmuss50
8238db1778 Improve error messages when using outdated Java or Gradle. 2021-05-26 11:41:52 +01:00
Mitchell Skaggs
1f80e00e88 Add classifier to "fake" mods' id if they have a classifier specified (#394) 
* Remove unused codepath (`RemapJarTask` is an `AbstractArchiveTask`)

* Remove incorrect comment

Comment originally added in 02e9616622

* 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-22 23:29:02 +01:00
LogicFan
e955ebb8c5 add support for new dependencyResolutionManagement (#400) 
* move repo declartions

- Move repository declartions in MavenConfiguration.java to LoomRepositoryPlugin.java

* move repo declartions

- Move repository declartions in MinecraftMappedProvider.java to LoomRepositoryPlugin.java

* move repo declartions

- Move repository declarations in MinecraftProcessedProvider.java to LoomRepositoryPlugin.java

* do not add repositories if dependencyResolutionManagement is used

* Simplify the change on LoomGradlePlugin

- this is the suggestion from liach

* change name to follow fabric naming convension

- change getProjectUUID to getProjectUuid
- change PROJECT_MAPPED_CLASSIFIER to projectMappedClassifier

* remove MavenConfiguration.java

- the file currently do nothing.

* clean-up for all `instanceof` clause

* add DependencyResolutionManagementTest

* code cleanup

* Update src/test/resources/projects/dependencyResolutionManagement/projmap/src/main/resources/modid.accesswidener

* change project uuid to project full name

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-05-22 23:28:42 +01:00
modmuss50
de665ab498 Add SignedProjectTest #404 2021-05-20 23:47:48 +01:00
shedaniel
5692cb277c Merge remote-tracking branch 'FabricMC/dev/0.8' into dev/0.8 
# Conflicts:
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
 2021-05-20 22:20:38 +08:00
modmuss50
93b2aebaf8 Update MCE to 0.4.4 2021-05-18 21:00:08 +01:00
modmuss50
90ff811ecd Make the run config api stable 2021-05-15 19:58:08 +01:00
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
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
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
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
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
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
da286b6c86 Change plugin ID to "dev.architectury.loom" 2021-05-03 18:40:02 +08:00