Commit Graph
111 Commits
Author SHA1 Message Date
makamys ccfac24f02 Change group to legacymoddingmc 2023-02-03 18:20:16 +01:00
modmuss50 63837a0952 Update gradle 2022-01-28 14:14:49 +00:00
modmuss50 03b0b8f571 Merge remote-tracking branch 'SpongePowered/0.8.5'
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java
#	src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java
#	src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java
#	src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationEnvironment.java
#	src/ap/java/org/spongepowered/tools/obfuscation/ReferenceManager.java
#	src/ap/java/org/spongepowered/tools/obfuscation/mapping/common/MappingWriter.java
#	src/ap/java/org/spongepowered/tools/obfuscation/service/ObfuscationServices.java
#	src/main/java/org/spongepowered/asm/launch/platform/MainAttributes.java
2021-12-13 16:18:54 +00:00
Mumfrey a396db8cd1 Update checkstyle 2021-12-01 20:25:07 +00:00
Mumfrey a40e4bc59a Move potemkin generator to buildSrc and switch to groovy 2021-12-01 19:30:51 +00:00
zml 8cd66d8241 build: Synthesize modules to link with multiple versions of libraries
Gson and Guava are both used in pre- and post-modular versions in
environments where Mixin is used on the module path, so we have to be
able to link against both in the compile-time module descriptor.
2021-12-01 08:15:18 -08:00
modmuss50 87f48a945c Fix File/Memory leak in Annotation Processor. (#67)
* Fix File/Memory leak in Annotation Processor.

Mixin's AP requires the minecraft jar + deps on the AP classpath to generate a refmap. These files are then opened by the classloader.

TargetMap uses Java's object Serialization to save/load itself from files. When doing so it gets placed into ObjectStreamClass.Caches, this does not get garbage collected enough to allow the Classloader to close, and thus close the file handles it has open.

This commit uses Gson to read/write TargetMap to prevent this class form being added to the global JVM cache.

* Manually build/read json structure
2021-10-16 12:17:12 +01:00
modmuss50 b7c9b81b04 Merge remote-tracking branch 'SpongePowered/0.8.4'
# Conflicts:
#	build.gradle
#	gradle.properties
2021-09-07 21:59:34 +01:00
zml 87b36f6707 Adjust modularity build configuration to avoid duplicate sources
This allows the shadow task to apply its own merging logic for
resources that are validly duplicated, in this case service files

The checkstyle exclusion for module-info is moved from the
buildscript to checkstyle.xml, for application within IDEs, not just
Gradle.

A small fix to PrettyPrinter is included as well, based on a line
incorrectly converted from log4j2.
2021-08-30 22:53:08 -07:00
modmuss50 dde1ad33a6 Merge remote-tracking branch 'SpongePowered/0.8.4' 2021-08-25 21:25:15 +01:00
Mumfrey 4c7beea14c Separate Profiler instances for things which can operate concurrently 2021-08-25 18:32:27 +01:00
modmuss50 0db87e68eb Fix Implementation-Version in jar manifest 2021-08-18 23:18:26 +01:00
modmuss50 35f48fbb99 Fix proguardJar not being built with the build task 2021-08-18 22:26:42 +01:00
modmuss50 913050a85e Merge remote-tracking branch 'sponge/0.8.4'
# Conflicts:
#	build.gradle
#	src/main/java/org/spongepowered/asm/mixin/refmap/RemappingReferenceMapper.java
#	src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java
2021-08-18 21:24:16 +01:00
Mumfrey 72d0812084 Delegate all logging to service, removing core dependency on log4j2 2021-08-18 18:51:58 +01:00
modmuss50 b78ceb024a Shade guava and gson, remap log4j usage. Update to gradle 7 (#53) 2021-08-16 15:51:40 +01:00
modmuss50 26365db833 Post merge compile fixes. 2021-08-14 14:56:28 +01:00
modmuss50 99e11dd82d Merge remote-tracking branch 'sponge/master'
# Conflicts:
#	build.gradle
2021-08-14 14:47:34 +01:00
modmuss50 45917bee6b Merge remote-tracking branch 'sponge/master'
# Conflicts:
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java
2021-08-14 14:45:50 +01:00
Mumfrey 9b64432787 Fix javadoc by using Java 8 as default and specifying 16 where needed 2021-08-14 14:41:46 +01:00
Mumfrey e4d3adf235 Include module-info in final artefact, remove thin jar for now 2021-08-14 14:17:20 +01:00
Mumfrey 0ad070ad02 Update to gradle 7, ASM 9.2, ModLauncher 9.0.7 add JPMS 2021-08-12 12:46:01 +01:00
modmuss50 cf0d6242cd Merge remote-tracking branch 'SpongePowered/0.8.3'
# Conflicts:
#	gradle.properties
#	src/fernflower/java/org/spongepowered/asm/mixin/transformer/debug/RuntimeDecompiler.java
2021-07-01 19:08:42 +01:00
Mumfrey 9d4fcbb678 Update checkstyle 2021-06-30 19:13:06 +01:00
modmuss50 0ce2d4f8c4 Merge remote-tracking branch 'SpongePowered/0.8.3' into upstream_merge
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java
#	src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java
2021-06-27 10:55:25 +01:00
modmuss50 1e9b0b9a9e Fix log messages still being logged, update shadow plugin. 2021-02-07 20:34:05 +00:00
Mumfrey ae5bb845da Update checkstyle 2021-02-06 01:17:07 +00:00
Mumfrey c1aec0fb49 Show the javadoc some love and a bit of a facelift, improve some docs
Closes #457, closes #446
2021-02-06 01:14:07 +00:00
modmuss50 e79be6c4bb Fix local build detection 2021-02-05 18:19:39 +00:00
modmuss50 109d53f2c5 Fix publish... 2021-02-05 18:11:12 +00:00
modmuss50 6008d6f3cf Build script updates (#46)
Build using GHA
Drop Java 6 and 7 support
Bump to ASM 9
Update gradle
New versioning
2021-02-05 18:04:04 +00:00
Mumfrey f9aeec8b05 Bump version to 0.8.3-SNAPSHOT 2021-01-31 23:04:13 +00:00
modmuss50 279f1e6957 Merge remote-tracking branch 'remotes/sponge/master' into fabric-0.8
# Conflicts:
#	gradle.properties
2020-10-05 18:59:57 +01:00
Mumfrey 9f5191d100 Update to ModLauncher 7.0 - Fixes #439 2020-09-17 11:36:23 +01:00
modmuss50 5e8e99249d Set correct build version 2020-07-17 00:23:44 +01:00
Mumfrey 2817c670e8 Publish AP jar to maven, derp 2020-04-15 20:08:47 +01:00
modmuss50 5442b78e67 Merge remote-tracking branch 'remotes/sponge/master' into fabric-0.8
# Conflicts:
#	build.gradle
#	gradle.properties
2020-01-13 17:20:03 +00:00
Mumfrey 6f6cee9674 Mixin 0.8 RELEASE 2020-01-10 20:56:46 +00:00
Mumfrey c338f0c7a4 Update build with POM exclusions for older builds and maven repo switch 2020-01-10 18:08:17 +00:00
Mumfrey 36c29218a8 Update checkstyle 2019-11-15 12:45:50 +00:00
modmuss50 6349e6c507 Fix build number 2019-11-09 20:08:07 +00:00
modmuss50 b1a5d6e4c7 Merge remote-tracking branch 'remotes/upstream/0.8' into fabric-0.8
# Conflicts:
#	build.gradle
#	gradle.properties
2019-11-09 19:20:44 +00:00
Mumfrey d4fa032d7d Add audit trail support for ModLauncher 4.2, update checkstyle 2019-11-09 18:38:45 +00:00
modmuss50 57eefe4e22 Merge remote-tracking branch 'remotes/upstream/0.8' into fabric-0.8
# Conflicts:
#	build.gradle
#	src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java
#	src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java
2019-11-03 12:11:33 +00:00
Mumfrey 11e71bc3f2 Some build-script tweaks for maven publishing 2019-10-31 19:33:48 +00:00
modmuss50 ed1a103051 Merge remote-tracking branch 'remotes/upstream/0.8' into fabric-0.8
# Conflicts:
#	build.gradle
#	src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java
2019-10-11 20:58:42 +01:00
Mumfrey 002e5288e8 Add an ASM detector and support backwards compatibility with ASM 5.x 2019-10-11 19:26:04 +01:00
Mumfrey b00992e411 Minor tweaks and fixes 2019-10-11 17:57:08 +01:00
Cameron Weaver (Clutch) f703afb9c3 Fix Java9+ legacylauncher classloading
Fix gradle building
2019-10-02 10:54:40 -04:00
Mumfrey 57d5655f73 Update for ModLauncher 4.0, remove ugly hax, connectors now via manifest 2019-09-29 21:34:42 +01:00