From dd89e232154f930939ddebdf7e4d841dcb9e917b Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sat, 2 Nov 2019 15:03:45 +0000 Subject: [PATCH] Check mixingradle version in AP so we can notify if mixin ver is ahead --- .../tools/obfuscation/AnnotatedMixins.java | 24 ++++++++++++++++++- .../tools/obfuscation/SupportedOptions.java | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index fdbfee26..c831b057 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -59,6 +59,7 @@ import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Invoker; import org.spongepowered.asm.util.ITokenProvider; +import org.spongepowered.asm.util.VersionNumber; import org.spongepowered.tools.obfuscation.interfaces.IJavadocProvider; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import org.spongepowered.tools.obfuscation.interfaces.IMixinValidator; @@ -83,6 +84,8 @@ import com.google.common.collect.ImmutableList.Builder; final class AnnotatedMixins implements IMixinAnnotationProcessor, ITokenProvider, ITypeHandleProvider, IJavadocProvider { private static final String MAPID_SYSTEM_PROPERTY = "mixin.target.mapid"; + + private static final String RECOMMENDED_MIXINGRADLE_VERSION = "0.7"; /** * Singleton instances for each ProcessingEnvironment @@ -143,6 +146,7 @@ final class AnnotatedMixins implements IMixinAnnotationProcessor, ITokenProvider this.processingEnv = processingEnv; this.printMessage(Kind.NOTE, "SpongePowered MIXIN Annotation Processor Version=" + MixinBootstrap.VERSION); + this.checkPluginVersion(this.getOption(SupportedOptions.PLUGIN_VERSION)); this.targets = this.initTargetMap(); this.obf = new ObfuscationManager(this); @@ -152,10 +156,28 @@ final class AnnotatedMixins implements IMixinAnnotationProcessor, ITokenProvider new ParentValidator(this), new TargetValidator(this) ); - + this.initTokenCache(this.getOption(SupportedOptions.TOKENS)); } + /** + * If MixinGradle is in use, check the version. This will allow us to notify + * the user if the version of MixinGradle is out of date relative to the + * Mixin library version + */ + private void checkPluginVersion(String version) { + if (version == null) { + return; + } + + VersionNumber pluginVersion = VersionNumber.parse(version); + VersionNumber recommendedVersion = VersionNumber.parse(AnnotatedMixins.RECOMMENDED_MIXINGRADLE_VERSION); + if (pluginVersion.compareTo(recommendedVersion) < 0) { + this.printMessage(Kind.WARNING, String.format("MixinGradle version %s is out of date. Update to the recommended version %s", + pluginVersion, recommendedVersion)); + } + } + protected TargetMap initTargetMap() { TargetMap targets = TargetMap.create(System.getProperty(AnnotatedMixins.MAPID_SYSTEM_PROPERTY)); System.setProperty(AnnotatedMixins.MAPID_SYSTEM_PROPERTY, targets.getSessionId()); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java index ac296681..e7d1de21 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java @@ -46,6 +46,7 @@ public final class SupportedOptions { public static final String DEFAULT_OBFUSCATION_ENV = "defaultObfuscationEnv"; public static final String DEPENDENCY_TARGETS_FILE = "dependencyTargetsFile"; public static final String MAPPING_TYPES = "mappingTypes"; + public static final String PLUGIN_VERSION = "pluginVersion"; private SupportedOptions() {}