Skip to content

Commit c920aa5

Browse files
ting-yuanKSP Auto Pick
authored andcommitted
Do not minimize embeddable jars
The maintenance is proven to be unsustainable. The jar size grows from 58MB to 75MB. (cherry picked from commit 046b539)
1 parent 5a0035a commit c920aa5

File tree

3 files changed

+1
-54
lines changed

3 files changed

+1
-54
lines changed

kotlin-analysis-api/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,6 @@ tasks.withType<ShadowJar>().configureEach {
163163
exclude("kotlin/**")
164164
exclude("kotlinx/coroutines/**")
165165
archiveClassifier.set("")
166-
minimize {
167-
exclude(dependency("org.lz4:lz4-java:.*"))
168-
exclude(dependency("com.github.ben-manes.caffeine:caffeine:.*"))
169-
}
170166
mergeServiceFiles()
171167
}
172168

kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -651,56 +651,6 @@ fun String?.toKotlinVersion(): KotlinVersion {
651651
}
652652
}
653653

654-
// Workaround for ShadowJar's minimize, whose configuration isn't very flexible.
655-
/* ktlint-disable */
656-
@Suppress("unused")
657-
@OptIn(KaImplementationDetail::class)
658-
internal val DEAR_SHADOW_JAR_PLEASE_DO_NOT_REMOVE_THESE = listOf(
659-
it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap::class.java,
660-
it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap::class.java,
661-
org.jetbrains.kotlin.analysis.api.impl.base.java.source.JavaElementSourceWithSmartPointerFactory::class.java,
662-
org.jetbrains.kotlin.analysis.api.impl.base.projectStructure.KaBaseModuleProvider::class.java,
663-
org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService::class.java,
664-
org.jetbrains.kotlin.analysis.api.fir.KaFirDefaultImportsProvider::class.java,
665-
org.jetbrains.kotlin.analysis.api.fir.KaFirSessionProvider::class.java,
666-
org.jetbrains.kotlin.analysis.api.fir.references.ReadWriteAccessCheckerFirImpl::class.java,
667-
org.jetbrains.kotlin.analysis.api.standalone.base.declarations.KotlinStandaloneFirDirectInheritorsProvider::class.java,
668-
org.jetbrains.kotlin.analysis.low.level.api.fir.services.LLRealFirElementByPsiElementChooser::class.java,
669-
org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSessionInvalidationService::class.java,
670-
org.jetbrains.kotlin.analysis.low.level.api.fir.symbolProviders.factories.LLStubOriginLibrarySymbolProviderFactory::class.java,
671-
org.jetbrains.kotlin.analysis.api.impl.base.java.KaBaseJavaModuleResolver::class.java,
672-
org.jetbrains.kotlin.analysis.api.impl.base.java.KaBaseKotlinJavaPsiFacade::class.java,
673-
org.jetbrains.kotlin.analysis.api.impl.base.permissions.KaBaseAnalysisPermissionChecker::class.java,
674-
org.jetbrains.kotlin.analysis.api.impl.base.permissions.KaBaseAnalysisPermissionRegistry::class.java,
675-
org.jetbrains.kotlin.analysis.api.impl.base.projectStructure.KaBaseContentScopeProvider::class.java,
676-
org.jetbrains.kotlin.analysis.api.impl.base.projectStructure.KaBaseResolutionScopeProvider::class.java,
677-
org.jetbrains.kotlin.analysis.api.impl.base.projectStructure.KotlinOptimizingGlobalSearchScopeMerger::class.java,
678-
org.jetbrains.kotlin.analysis.api.permissions.KaAnalysisPermissionRegistry::class.java,
679-
org.jetbrains.kotlin.analysis.api.platform.KotlinProjectMessageBusProvider::class.java,
680-
org.jetbrains.kotlin.analysis.api.platform.permissions.KaAnalysisPermissionChecker::class.java,
681-
org.jetbrains.kotlin.analysis.api.fir.modification.KaFirSourceModificationService::class.java,
682-
org.jetbrains.kotlin.analysis.api.fir.references.KotlinFirReferenceContributor::class.java,
683-
org.jetbrains.kotlin.analysis.api.fir.statistics.KaFirStatisticsService::class.java,
684-
org.jetbrains.kotlin.light.classes.symbol.SymbolKotlinAsJavaSupport::class.java,
685-
org.jetbrains.kotlin.load.java.ErasedOverridabilityCondition::class.java,
686-
org.jetbrains.kotlin.load.java.FieldOverridabilityCondition::class.java,
687-
org.jetbrains.kotlin.plugin.references.SimpleNameReferenceExtension::class.java,
688-
org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInsLoaderImpl::class.java,
689-
com.fasterxml.aalto.AaltoInputProperties::class.java,
690-
com.google.errorprone.annotations.CheckReturnValue::class.java,
691-
com.intellij.diagnostic.ActivityCategory::class.java,
692-
com.intellij.openapi.application.JetBrainsProtocolHandler::class.java,
693-
com.intellij.openapi.editor.impl.EditorDocumentPriorities::class.java,
694-
com.intellij.platform.diagnostic.telemetry.TelemetryManager::class.java,
695-
com.intellij.psi.impl.PsiSubstitutorImpl::class.java,
696-
com.intellij.psi.tree.ChildRoleBase::class.java,
697-
com.intellij.util.xmlb.Constants::class.java,
698-
com.intellij.xml.CommonXmlStrings::class.java,
699-
org.codehaus.stax2.XMLInputFactory2::class.java,
700-
org.codehaus.stax2.XMLStreamProperties::class.java,
701-
)
702-
/* ktlint-enable */
703-
704654
fun TargetPlatform.getPlatformInfo(kspConfig: KSPConfig): List<PlatformInfo> =
705655
componentPlatforms.map { platform ->
706656
when (platform) {

symbol-processing-aa-embeddable/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ val prefixesToRelocate = listOf(
4444
"com.google.errorprone.",
4545
"com.google.gwt.",
4646
"com.google.j2objc.",
47+
"com.google.thirdparty.",
4748
"com.intellij.",
4849
"com.sun.jna.",
4950
"gnu.trove.",

0 commit comments

Comments
 (0)