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

Refactoring: rename android-jps-plugin to android-extensions-jps

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2016-03-11 16:04:52 +03:00
parent bf4c92d903
commit 78d4860215
15 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-jps-plugin/android-jps-plugin.iml → plugins/android-extensions/android-extensions-jps/android-extensions-jps.iml
+4 -4
View File
@@ -19,14 +19,14 @@
<orderEntry type="module-library" scope="TEST">
<library name="idea-gradle-plugin">
<CLASSES>
<root url="file://$MODULE_DIR$/../../ideaSDK/plugins/gradle/lib" />
<root url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$MODULE_DIR$/../../ideaSDK/plugins/gradle/lib" />
<root url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" />
</SOURCES>
<jarDirectory url="file://$MODULE_DIR$/../../ideaSDK/plugins/gradle/lib" recursive="false" />
<jarDirectory url="file://$MODULE_DIR$/../../ideaSDK/plugins/gradle/lib" recursive="false" type="SOURCES" />
<jarDirectory url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" recursive="false" />
<jarDirectory url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" recursive="false" type="SOURCES" />
</library>
</orderEntry>
</component>
plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt → plugins/android-extensions/android-extensions-jps/src/KotlinAndroidJpsPlugin.kt
+7 -7
View File
@@ -16,14 +16,14 @@
package org.jetbrains.kotlin.android.jps
import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider
import org.jetbrains.jps.incremental.ModuleBuildTarget
import org.jetbrains.jps.incremental.CompileContext
import org.jetbrains.jps.model.module.JpsModule
import java.io.File
import org.jetbrains.jps.android.AndroidJpsUtil
import com.intellij.util.PathUtil
import org.jetbrains.jps.android.AndroidJpsUtil
import org.jetbrains.jps.incremental.CompileContext
import org.jetbrains.jps.incremental.ModuleBuildTarget
import org.jetbrains.jps.model.module.JpsModule
import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider
import org.w3c.dom.Document
import java.io.File
import javax.xml.parsers.DocumentBuilderFactory
class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
@@ -70,7 +70,7 @@ class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
val libDirectory = File(PathUtil.getJarPathForClass(javaClass)).parentFile.parentFile
File(libDirectory, JAR_FILE_NAME).absolutePath
} else {
// We're in tests now (in out/production/android-jps-plugin)
// We're in tests now (in out/production/android-extensions/android-extensions-jps)
val kotlinProjectDirectory = File(PathUtil.getJarPathForClass(javaClass)).parentFile.parentFile.parentFile
File(kotlinProjectDirectory, "dist/kotlinc/lib/$JAR_FILE_NAME").absolutePath
})
plugins/android-jps-plugin/src/META-INF/services/org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider → plugins/android-extensions/android-extensions-jps/src/META-INF/services/org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider
View File
plugins/android-jps-plugin/testData/android/simple/AndroidManifest.xml → plugins/android-extensions/android-extensions-jps/testData/android/simple/AndroidManifest.xml
Vendored
View File
plugins/android-jps-plugin/testData/android/simple/res/layout/activity_main.xml → plugins/android-extensions/android-extensions-jps/testData/android/simple/res/layout/activity_main.xml
Vendored
View File
plugins/android-jps-plugin/testData/android/simple/res/layout/fragment.xml → plugins/android-extensions/android-extensions-jps/testData/android/simple/res/layout/fragment.xml
Vendored
View File
plugins/android-jps-plugin/testData/android/simple/simple.iml → plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.iml
Vendored
View File
plugins/android-jps-plugin/testData/android/simple/simple.ipr → plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.ipr
Vendored
View File
plugins/android-jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt → plugins/android-extensions/android-extensions-jps/testData/android/simple/src/com/example/myapp/MyActivity.kt
Vendored
View File
plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt → plugins/android-extensions/android-extensions-jps/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
View File
plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java → plugins/android-extensions/android-extensions-jps/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java
+3 -3
View File
@@ -27,17 +27,17 @@ import java.util.regex.Pattern;
/** 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")
@TestMetadata("plugins/android-extensions/android-extensions-jps/testData/android")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class AndroidJpsTestCaseGenerated extends AbstractAndroidJpsTestCase {
public void testAllFilesPresentInAndroid() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-jps-plugin/testData/android"), Pattern.compile("^([^\\.]+)$"), false);
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-extensions/android-extensions-jps/testData/android"), Pattern.compile("^([^\\.]+)$"), false);
}
@TestMetadata("simple")
public void testSimple() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("plugins/android-jps-plugin/testData/android/simple/");
String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-jps/testData/android/simple/");
doTest(fileName);
}
}