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

Android Extensions: Fixes after review

Browse Source
This commit is contained in:
Yan Zhulanow
2017-06-13 15:48:33 +03:00
parent 7b238e0b21
commit b303fa9caa
9 changed files with 61 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBytecodeShapeTest.kt
+1 -1
View File
@@ -30,7 +30,7 @@ abstract class AbstractAndroidBytecodeShapeTest : AbstractBytecodeTextTest() {
private fun createEnvironmentForConfiguration(configuration: CompilerConfiguration, path: String) {
val layoutPaths = getResPaths(path)
myEnvironment = createTestEnvironment(configuration, layoutPaths)
addAERuntimeLibrary(myEnvironment)
addAndroidExtensionsRuntimeLibrary(myEnvironment)
}
override fun doTest(path: String) {
plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/CompilerTestUtils.kt
+2 -2
View File
@@ -51,12 +51,12 @@ fun KtUsefulTestCase.createTestEnvironment(configuration: CompilerConfiguration,
ClassBuilderInterceptorExtension.registerExtension(project, AndroidOnDestroyClassBuilderInterceptorExtension())
PackageFragmentProviderExtension.registerExtension(project, CliAndroidPackageFragmentProviderExtension())
addAERuntimeLibrary(myEnvironment)
addAndroidExtensionsRuntimeLibrary(myEnvironment)
return myEnvironment
}
fun addAERuntimeLibrary(environment: KotlinCoreEnvironment) {
fun addAndroidExtensionsRuntimeLibrary(environment: KotlinCoreEnvironment) {
environment.apply {
val runtimeLibrary = File("out/production/android-extensions-runtime")
updateClasspath(listOf(JvmClasspathRoot(runtimeLibrary)))