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

Android Extensions: fix cli tests

Browse Source
This commit is contained in:
Yan Zhulanow
2015-11-18 17:29:11 +03:00
parent 148ec829a3
commit 39e6c6e500
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/pluginSimple.args
Vendored
+2 -2
View File
@@ -3,8 +3,8 @@ $TEMP_DIR$
-Xplugin -Xplugin
dist/kotlinc/lib/android-compiler-plugin.jar dist/kotlinc/lib/android-compiler-plugin.jar
-P -P
plugin\:org.jetbrains.kotlin.android\:androidManifest=$TESTDATA_DIR$/androidPlugin/AndroidManifest.xml plugin\:org.jetbrains.kotlin.android\:package=com.myapp
-P -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$/pluginSimple.kt
$TESTDATA_DIR$/androidPlugin $TESTDATA_DIR$/androidPlugin
compiler/testData/cli/jvm/pluginSimpleUsage.args
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ $TEMP_DIR$
-Xplugin -Xplugin
dist/kotlinc/lib/android-compiler-plugin.jar dist/kotlinc/lib/android-compiler-plugin.jar
-P -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$/pluginSimple.kt
$TESTDATA_DIR$/androidPlugin/androidApp.kt $TESTDATA_DIR$/androidPlugin/androidApp.kt
$TESTDATA_DIR$/androidPlugin/androidView.kt $TESTDATA_DIR$/androidPlugin/androidView.kt
compiler/testData/cli/jvm/pluginSimpleUsage.out
Vendored
+4 -4
View File
@@ -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: Plugin "org.jetbrains.kotlin.android" usage:
androidRes <path> Android resources path (required, multiple) variant <name;path> Android build variant (required, multiple)
androidManifest <path> Android manifest file (required) package <fq name> Application package (required)
COMPILATION_ERROR COMPILATION_ERROR