azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace KotlinPackage legacy facade with corresponding package parts.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-10-01 22:44:43 +03:00
parent fa491c8f1f
commit 1c79cf2b51
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
+2 -2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.maven; package org.jetbrains.kotlin.maven;
import com.intellij.util.ArrayUtil; import com.intellij.util.ArrayUtil;
import kotlin.StringsKt;
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase; 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.LibraryUtils;
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils; import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils;
import org.jetbrains.kotlin.js.JavaScript; import org.jetbrains.kotlin.js.JavaScript;
import kotlin.KotlinPackage;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@@ -87,7 +87,7 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase<K2JSCompilerArgument
} }
if (metaInfo) { if (metaInfo) {
String output = com.google.common.base.Objects.firstNonNull(outputFile, ""); // fqname here because of J8 compatibility issues 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()); collector.add(new File(metaFile).getParent());
} }
} }
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.maven;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ArrayUtil; import com.intellij.util.ArrayUtil;
import com.sampullara.cli.Args; import com.sampullara.cli.Args;
import kotlin.KotlinPackage; import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function1;
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoExecutionException;
@@ -134,7 +134,7 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
} }
protected List<String> filterClassPath(List<String> classpath) { protected List<String> filterClassPath(List<String> classpath) {
return KotlinPackage.filter(classpath, new Function1<String, Boolean>() { return CollectionsKt.filter(classpath, new Function1<String, Boolean>() {
@Override @Override
public Boolean invoke(String s) { public Boolean invoke(String s) {
return new File(s).exists() || new File(project.getBasedir(), s).exists(); return new File(s).exists() || new File(project.getBasedir(), s).exists();