Reduce filesizes, update Kotlin metadata to 2.1.20 (#473)

sschr15 · web-flow · commit dc42d3346b04 · 2025-04-02T12:56:32.000-04:00
* Reduce filesizes, update Kotlin metadata to 2.1.20

* Fix issue with unintended additional metadata removals
diff --git a/build.gradle b/build.gradle
@@ -233,6 +233,7 @@ tasks.withType(Jar) {
 }
 
 def allJar = tasks.register('allJar', Jar) {allJar ->
+  group = 'build'
   archiveClassifier.set('')
   from sourceSets.main.output
 
@@ -256,6 +257,13 @@ def allJar = tasks.register('allJar', Jar) {allJar ->
   }
 }
 
+subprojects {
+  Jar buildTask = it.tasks.named("true".equals(it.does_shadow) ? 'shadowJar' : 'jar').get() as Jar
+  buildTask.configure {
+    entryCompression = ZipEntryCompression.STORED
+  }
+}
+
 build.dependsOn(allJar)
 
 publishing {
diff --git a/plugins/kotlin/libs/metadata.jar b/plugins/kotlin/libs/metadata.jar
diff --git a/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinChooser.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinChooser.java
@@ -1,8 +1,8 @@
 package org.vineflower.kotlin;
 
-import kotlinx.metadata.internal.metadata.ProtoBuf;
-import kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf;
-import kotlinx.metadata.internal.protobuf.ExtensionRegistryLite;
+import kotlin.metadata.internal.metadata.ProtoBuf;
+import kotlin.metadata.internal.metadata.jvm.JvmProtoBuf;
+import kotlin.metadata.internal.protobuf.ExtensionRegistryLite;
 import org.jetbrains.java.decompiler.api.plugin.LanguageChooser;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
diff --git a/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinDecompilationContext.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinDecompilationContext.java
@@ -1,6 +1,6 @@
 package org.vineflower.kotlin;
 
-import kotlinx.metadata.internal.metadata.ProtoBuf;
+import kotlin.metadata.internal.metadata.ProtoBuf;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.util.Key;
 import org.vineflower.kotlin.metadata.MetadataNameResolver;
diff --git a/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinWriter.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinWriter.java
@@ -1,7 +1,7 @@
 // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.vineflower.kotlin;
 
-import kotlinx.metadata.internal.metadata.ProtoBuf;
+import kotlin.metadata.internal.metadata.ProtoBuf;
 import net.fabricmc.fernflower.api.IFabricJavadocProvider;
 import org.jetbrains.java.decompiler.api.plugin.StatementWriter;
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/plugins/kotlin/src/main/java/org/vineflower/kotlin/metadata/MetadataNameResolver.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/metadata/MetadataNameResolver.java
@@ -1,6 +1,6 @@
 package org.vineflower.kotlin.metadata;
 
-import kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf;
+import kotlin.metadata.internal.metadata.jvm.JvmProtoBuf;
 
 import java.util.*;
 
diff --git a/plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KConstructor.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KConstructor.java
@@ -1,7 +1,7 @@
 package org.vineflower.kotlin.struct;
 
-import kotlinx.metadata.internal.metadata.ProtoBuf;
-import kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf;
+import kotlin.metadata.internal.metadata.ProtoBuf;
+import kotlin.metadata.internal.metadata.jvm.JvmProtoBuf;
 import org.jetbrains.java.decompiler.main.ClassesProcessor;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.collectors.ImportCollector;
diff --git a/plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KContract.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KContract.java
@@ -1,6 +1,6 @@
 package org.vineflower.kotlin.struct;
 
-import kotlinx.metadata.internal.metadata.ProtoBuf;
+import kotlin.metadata.internal.metadata.ProtoBuf;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
diff --git a/plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KFunction.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KFunction.java
@@ -1,7 +1,7 @@
 package org.vineflower.kotlin.struct;
 
-import kotlinx.metadata.internal.metadata.ProtoBuf;
-import kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf;
+import kotlin.metadata.internal.metadata.ProtoBuf;
+import kotlin.metadata.internal.metadata.jvm.JvmProtoBuf;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KProperty.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KProperty.java
@@ -1,7 +1,7 @@
 package org.vineflower.kotlin.struct;
 
-import kotlinx.metadata.internal.metadata.ProtoBuf;
-import kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf;
+import kotlin.metadata.internal.metadata.ProtoBuf;
+import kotlin.metadata.internal.metadata.jvm.JvmProtoBuf;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KType.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KType.java
@@ -1,6 +1,6 @@
 package org.vineflower.kotlin.struct;
 
-import kotlinx.metadata.internal.metadata.ProtoBuf;
+import kotlin.metadata.internal.metadata.ProtoBuf;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
diff --git a/plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KTypeParameter.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KTypeParameter.java
@@ -1,6 +1,6 @@
 package org.vineflower.kotlin.struct;
 
-import kotlinx.metadata.internal.metadata.ProtoBuf;
+import kotlin.metadata.internal.metadata.ProtoBuf;
 import org.vineflower.kotlin.metadata.MetadataNameResolver;
 
 import java.util.List;
diff --git a/plugins/kotlin/src/main/java/org/vineflower/kotlin/util/KUtils.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/util/KUtils.java
@@ -1,6 +1,6 @@
 package org.vineflower.kotlin.util;
 
-import kotlinx.metadata.internal.metadata.ProtoBuf;
+import kotlin.metadata.internal.metadata.ProtoBuf;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
diff --git a/plugins/kotlin/src/main/java/org/vineflower/kotlin/util/ProtobufFlags.java b/plugins/kotlin/src/main/java/org/vineflower/kotlin/util/ProtobufFlags.java
@@ -1,7 +1,7 @@
 package org.vineflower.kotlin.util;
 
-import kotlinx.metadata.internal.metadata.ProtoBuf;
-import kotlinx.metadata.internal.metadata.deserialization.Flags;
+import kotlin.metadata.internal.metadata.ProtoBuf;
+import kotlin.metadata.internal.metadata.deserialization.Flags;
 
 public interface ProtobufFlags {
   //TODO: hasNonStableParameterNames

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,7 @@ tasks.withType(Jar) {`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`def allJar = tasks.register('allJar', Jar) {allJar ->`
	`236`	`+ group = 'build'`
`236`	`237`	`archiveClassifier.set('')`
`237`	`238`	`from sourceSets.main.output`
`238`	`239`
`@@ -256,6 +257,13 @@ def allJar = tasks.register('allJar', Jar) {allJar ->`
`256`	`257`	`}`
`257`	`258`	`}`
`258`	`259`
	`260`	`+subprojects {`
	`261`	`+ Jar buildTask = it.tasks.named("true".equals(it.does_shadow) ? 'shadowJar' : 'jar').get() as Jar`
	`262`	`+ buildTask.configure {`
	`263`	`+ entryCompression = ZipEntryCompression.STORED`
	`264`	`+ }`
	`265`	`+}`
	`266`	`+`
`259`	`267`	`build.dependsOn(allJar)`
`260`	`268`
`261`	`269`	`publishing {`