From 46938a37988c74c88b613228be707a2ac1605979 Mon Sep 17 00:00:00 2001 From: JFronny Date: Thu, 13 Oct 2022 20:39:00 +0200 Subject: [PATCH] [build] Fix --- build.gradle.kts | 2 +- .../libjf/config/plugin/asm/ConfigInjectClassTransformer.java | 2 +- .../jfronny/libjf/config/plugin/util/GeneratorAdapter2.java | 2 +- settings.gradle.kts | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bfb4f47..b7b65c3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ import io.gitlab.jfronny.scripts.* plugins { - id("jfmod") version "1.0-SNAPSHOT" + id("jfmod") version "1.1-SNAPSHOT" } val nonModSubprojects: List by extra diff --git a/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/asm/ConfigInjectClassTransformer.java b/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/asm/ConfigInjectClassTransformer.java index c424683..e11de61 100644 --- a/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/asm/ConfigInjectClassTransformer.java +++ b/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/asm/ConfigInjectClassTransformer.java @@ -222,7 +222,7 @@ public class ConfigInjectClassTransformer extends ClassVisitor { } public GeneratorAdapter2 method(int access, String name, String descriptor, String signature, String[] exceptions) { - if (BuildMetadata.isRelease && !name.equals(CLINIT)) access |= ACC_SYNTHETIC; + if (BuildMetadata.IS_RELEASE && !name.equals(CLINIT)) access |= ACC_SYNTHETIC; return new GeneratorAdapter2(super.visitMethod(access, name, descriptor, signature, exceptions), access, name, descriptor); } } diff --git a/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/util/GeneratorAdapter2.java b/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/util/GeneratorAdapter2.java index a853b51..b34fbbe 100644 --- a/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/util/GeneratorAdapter2.java +++ b/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/util/GeneratorAdapter2.java @@ -110,7 +110,7 @@ public class GeneratorAdapter2 extends GeneratorAdapter { } public void comment(String comment) { - if (BuildMetadata.isRelease) return; + if (BuildMetadata.IS_RELEASE) return; push("[Comment/Generator] " + comment); pop(); } diff --git a/settings.gradle.kts b/settings.gradle.kts index 59eaf89..3bd6017 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,6 @@ pluginManagement { repositories { maven("https://maven.fabricmc.net/") // FabricMC - maven("https://gitlab.com/api/v4/projects/32776914/packages/maven") // CurseGradle maven("https://gitlab.com/api/v4/projects/31672498/packages/maven") // scripts gradlePluginPortal() }