From 1c79cf2b512f3126cdae572a7cb4713cf6862ed6 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 1 Oct 2015 22:44:43 +0300
Subject: [PATCH] Replace KotlinPackage legacy facade with corresponding
 package parts.

---
 .../java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java     | 4 ++--
 .../java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
index 4f0da1a9036..72522f0dad6 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.maven;
 
 import com.intellij.util.ArrayUtil;
+import kotlin.StringsKt;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -29,7 +30,6 @@ import org.jetbrains.kotlin.cli.js.K2JSCompiler;
 import org.jetbrains.kotlin.utils.LibraryUtils;
 import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils;
 import org.jetbrains.kotlin.js.JavaScript;
-import kotlin.KotlinPackage;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -87,7 +87,7 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase<K2JSCompilerArgument
         }
         if (metaInfo) {
             String output = com.google.common.base.Objects.firstNonNull(outputFile, ""); // fqname here because of J8 compatibility issues
-            String metaFile = KotlinPackage.substringBeforeLast(output, JavaScript.DOT_EXTENSION, output) + KotlinJavascriptMetadataUtils.META_JS_SUFFIX;
+            String metaFile = StringsKt.substringBeforeLast(output, JavaScript.DOT_EXTENSION, output) + KotlinJavascriptMetadataUtils.META_JS_SUFFIX;
             collector.add(new File(metaFile).getParent());
         }
     }
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
index 49051ceb9d3..fecea9053a9 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.maven;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
 import com.sampullara.cli.Args;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -134,7 +134,7 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
     }
 
     protected List<String> filterClassPath(List<String> classpath) {
-        return KotlinPackage.filter(classpath, new Function1<String, Boolean>() {
+        return CollectionsKt.filter(classpath, new Function1<String, Boolean>() {
             @Override
             public Boolean invoke(String s) {
                 return new File(s).exists() || new File(project.getBasedir(), s).exists();