From f8de17b0396e579068dbf884f446e65d903c2f8c Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 10 Aug 2017 22:29:14 +0300 Subject: [PATCH] Remove guava usage from KotlinCodegenFacade - fix maven build --- .../org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java index 997c7636bca..414feecacde 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.codegen; -import com.google.common.collect.Sets; import com.intellij.util.containers.MultiMap; +import kotlin.collections.SetsKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.fileClasses.JvmFileClassInfo; @@ -66,13 +66,13 @@ public class KotlinCodegenFacade { } Set obsoleteMultifileClasses = new HashSet<>(state.getObsoleteMultifileClasses()); - for (FqName multifileClassFqName : Sets.union(filesInMultifileClasses.keySet(), obsoleteMultifileClasses)) { + for (FqName multifileClassFqName : SetsKt.plus(filesInMultifileClasses.keySet(), obsoleteMultifileClasses)) { doCheckCancelled(state); generateMultifileClass(state, multifileClassFqName, filesInMultifileClasses.get(multifileClassFqName), errorHandler); } Set packagesWithObsoleteParts = new HashSet<>(state.getPackagesWithObsoleteParts()); - for (FqName packageFqName : Sets.union(packagesWithObsoleteParts, filesInPackages.keySet())) { + for (FqName packageFqName : SetsKt.plus(packagesWithObsoleteParts, filesInPackages.keySet())) { doCheckCancelled(state); generatePackage(state, packageFqName, filesInPackages.get(packageFqName), errorHandler); }