From 39e6c6e5004f6c8e6ad70ef227064338fcb12def Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 18 Nov 2015 17:29:11 +0300 Subject: [PATCH] Android Extensions: fix cli tests --- compiler/testData/cli/jvm/pluginSimple.args | 4 ++-- compiler/testData/cli/jvm/pluginSimpleUsage.args | 2 +- compiler/testData/cli/jvm/pluginSimpleUsage.out | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler/testData/cli/jvm/pluginSimple.args b/compiler/testData/cli/jvm/pluginSimple.args index 82240c9cd8b..acf10bc843d 100644 --- a/compiler/testData/cli/jvm/pluginSimple.args +++ b/compiler/testData/cli/jvm/pluginSimple.args @@ -3,8 +3,8 @@ $TEMP_DIR$ -Xplugin dist/kotlinc/lib/android-compiler-plugin.jar -P -plugin\:org.jetbrains.kotlin.android\:androidManifest=$TESTDATA_DIR$/androidPlugin/AndroidManifest.xml +plugin\:org.jetbrains.kotlin.android\:package=com.myapp -P -plugin\:org.jetbrains.kotlin.android\:androidRes=$TESTDATA_DIR$/androidPlugin/res +plugin\:org.jetbrains.kotlin.android\:variant=main;$TESTDATA_DIR$/androidPlugin/res $TESTDATA_DIR$/pluginSimple.kt $TESTDATA_DIR$/androidPlugin \ No newline at end of file diff --git a/compiler/testData/cli/jvm/pluginSimpleUsage.args b/compiler/testData/cli/jvm/pluginSimpleUsage.args index 0bcc82ae737..72c3cd76539 100644 --- a/compiler/testData/cli/jvm/pluginSimpleUsage.args +++ b/compiler/testData/cli/jvm/pluginSimpleUsage.args @@ -3,7 +3,7 @@ $TEMP_DIR$ -Xplugin dist/kotlinc/lib/android-compiler-plugin.jar -P -plugin\:org.jetbrains.kotlin.android\:androidManifest=$TESTDATA_DIR$/androidPlugin/AndroidManifest.xml +plugin\:org.jetbrains.kotlin.android\:package=com.myapp $TESTDATA_DIR$/pluginSimple.kt $TESTDATA_DIR$/androidPlugin/androidApp.kt $TESTDATA_DIR$/androidPlugin/androidView.kt diff --git a/compiler/testData/cli/jvm/pluginSimpleUsage.out b/compiler/testData/cli/jvm/pluginSimpleUsage.out index 23f2b3bd07c..738822ee38e 100644 --- a/compiler/testData/cli/jvm/pluginSimpleUsage.out +++ b/compiler/testData/cli/jvm/pluginSimpleUsage.out @@ -1,7 +1,7 @@ -error: required plugin option not present: org.jetbrains.kotlin.android:androidRes +error: required plugin option not present: org.jetbrains.kotlin.android:variant Plugin "org.jetbrains.kotlin.android" usage: - androidRes Android resources path (required, multiple) - androidManifest Android manifest file (required) + variant Android build variant (required, multiple) + package Application package (required) -COMPILATION_ERROR +COMPILATION_ERROR \ No newline at end of file