Skip to content

Reduce filesizes, update Kotlin metadata to 2.1.20 #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 2, 2025
Merged

Reduce filesizes, update Kotlin metadata to 2.1.20 #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ce950b
Reduce filesizes, update Kotlin metadata to 2.1.20
sschr15 Mar 23, 2025
9f36264
Fix issue with unintended additional metadata removals
sschr15 Mar 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ tasks.withType(Jar) {
}

def allJar = tasks.register('allJar', Jar) {allJar ->
group = 'build'
archiveClassifier.set('')
from sourceSets.main.output

Expand All @@ -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 {
Expand Down
Binary file modified plugins/kotlin/libs/metadata.jar
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinChooser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinDecompilationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/kotlin/src/main/java/org/vineflower/kotlin/KotlinWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/kotlin/src/main/java/org/vineflower/kotlin/metadata/MetadataNameResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;

Expand Down
4 changes: 2 additions & 2 deletions plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KConstructor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/kotlin/src/main/java/org/vineflower/kotlin/struct/KTypeParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/kotlin/src/main/java/org/vineflower/kotlin/util/KUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions plugins/kotlin/src/main/java/org/vineflower/kotlin/util/ProtobufFlags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading