From ccbbaba7cd5a07ed1baf775b7057d66e7d956f08 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 10 Feb 2015 18:22:21 +0300 Subject: [PATCH] Rename jet to kotlin in Android JPS plugin --- .../kotlin/idea/references/JetSimpleNameReference.kt | 2 +- .../jps/build/KotlinJpsCompilerArgumentsProvider.kt | 4 ++-- .../jps/build/android/AndroidJpsTestCaseGenerated.java | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) rename jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/build/KotlinJpsCompilerArgumentsProvider.kt (92%) rename plugins/android-jps-plugin/tests/org/jetbrains/{jet => kotlin}/jps/build/android/AndroidJpsTestCaseGenerated.java (85%) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt index 72b5e3313fb..b1769f1e91f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.psi.psiUtil.* import com.intellij.psi.impl.light.LightElement import com.intellij.openapi.extensions.Extensions -import org.jetbrains.jet.plugin.findUsages.handlers.SimpleNameReferenceExtension +import org.jetbrains.kotlin.plugin.references.SimpleNameReferenceExtension public class JetSimpleNameReference( jetSimpleNameExpression: JetSimpleNameExpression diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt similarity index 92% rename from jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt rename to jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt index 0b5650aeef7..5b9286bd4f7 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.build +package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.CompileContext diff --git a/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java b/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java similarity index 85% rename from plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java rename to plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java index 055a63168f8..03c29b978b1 100644 --- a/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java +++ b/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.build.android; +package org.jetbrains.kotlin.jps.build.android; import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -25,7 +26,7 @@ import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("plugins/android-jps-plugin/testData/android") @TestDataPath("$PROJECT_ROOT")