diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml index fb08bfa4358..7e2d6dea446 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml +++ b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml @@ -1,27 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 1c4e42ca784..6a6c7e82ea8 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -241,9 +241,9 @@ open class KotlinAndroidPlugin: Plugin { } kotlinTask.doFirst({ task -> - var plugin = project.getPlugins().getPlugin("android") + var plugin = project.getPlugins().findPlugin("android") if (null == plugin) { - plugin = project.getPlugins().getPlugin("android-library") + plugin = project.getPlugins().findPlugin("android-library") } val basePlugin : BasePlugin = plugin as BasePlugin val javaSources = project.files(javaSourceList) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt index 58d571833ab..e96b14e1dab 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt @@ -58,6 +58,8 @@ class KotlinAndroidGradleIT { println(buildOutput) assertEquals(result, 0) + + assertTrue(buildOutput.contains(":LibAlfa:compileReleaseKotlin"), "Should contain ':LibAlfa:compileReleaseKotlin'") assertTrue(buildOutput.contains(":compileFlavor1DebugKotlin"), "Should contain ':compileFlavor1DebugKotlin'") assertTrue(buildOutput.contains(":compileFlavor2DebugKotlin"), "Should contain ':compileFlavor2DebugKotlin'") assertTrue(buildOutput.contains(":compileFlavor1JnidebugKotlin"), "Should contain ':compileFlavor1JnidebugKotlin'") @@ -92,18 +94,9 @@ class KotlinAndroidGradleIT { println(up2dateBuildOutput) assertEquals(up2dateResult, 0) - assertTrue(up2dateBuildOutput.contains(":compileFlavor1DebugKotlin UP-TO-DATE"), "Should contain ':compileFlavor1DebugKotlin UP-TO-DATE'") - assertTrue(up2dateBuildOutput.contains(":compileFlavor2DebugKotlin UP-TO-DATE"), "Should contain ':compileFlavor2DebugKotlin UP-TO-DATE'") - assertTrue(up2dateBuildOutput.contains(":compileFlavor1JnidebugKotlin UP-TO-DATE"), "Should contain ':compileFlavor1JnidebugKotlin' UP-TO-DATE") - assertTrue(up2dateBuildOutput.contains(":compileFlavor1ReleaseKotlin UP-TO-DATE"), "Should contain ':compileFlavor1ReleaseKotlin UP-TO-DATE'") - assertTrue(up2dateBuildOutput.contains(":compileFlavor2JnidebugKotlin UP-TO-DATE"), "Should contain ':compileFlavor2JnidebugKotlin UP-TO-DATE'") - assertTrue(up2dateBuildOutput.contains(":compileFlavor2ReleaseKotlin UP-TO-DATE"), "Should contain ':compileFlavor2ReleaseKotlin UP-TO-DATE'") - assertTrue(up2dateBuildOutput.contains(":compileFlavor1Debug UP-TO-DATE"), "Should contain ':compileFlavor1Debug UP-TO-DATE'") - assertTrue(up2dateBuildOutput.contains(":compileFlavor2Debug UP-TO-DATE"), "Should contain ':compileFlavor2Debug UP-TO-DATE'") - assertTrue(up2dateBuildOutput.contains(":compileFlavor1Jnidebug UP-TO-DATE"), "Should contain ':compileFlavor1Jnidebug UP-TO-DATE'") - assertTrue(up2dateBuildOutput.contains(":compileFlavor2Jnidebug UP-TO-DATE"), "Should contain ':compileFlavor2Jnidebug UP-TO-DATE'") - assertTrue(up2dateBuildOutput.contains(":compileFlavor1Release UP-TO-DATE"), "Should contain ':compileFlavor1Release UP-TO-DATE'") - assertTrue(up2dateBuildOutput.contains(":compileFlavor2Release UP-TO-DATE"), "Should contain ':compileFlavor2Release UP-TO-DATE'") + assertTrue(up2dateBuildOutput.contains(":LibAlfa:compileReleaseKotlin UP-TO-DATE"), "Should contain ':LibAlfa:compileReleaseKotlin UP-TO-DATE'") + assertTrue(up2dateBuildOutput.contains(":LibAlfa:compileRelease UP-TO-DATE"), "Should contain ':LibAlfa:compileReleas UP-TO-DATE'") + // Run the build third time, re-run tasks @@ -126,6 +119,7 @@ class KotlinAndroidGradleIT { println(rebuildOutput) assertEquals(reresult, 0) + assertTrue(buildOutput.contains(":LibAlfa:compileReleaseKotlin"), "Should contain ':LibAlfa:compileReleaseKotlin'") assertTrue(rebuildOutput.contains(":compileFlavor1DebugKotlin"), "Should contain ':compileFlavor1DebugKotlin'") assertTrue(rebuildOutput.contains(":compileFlavor2DebugKotlin"), "Should contain ':compileFlavor2DebugKotlin'") assertTrue(rebuildOutput.contains(":compileFlavor1JnidebugKotlin"), "Should contain ':compileFlavor1JnidebugKotlin'") diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle index ecaea3c8db6..cb69e5b7480 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle @@ -7,14 +7,14 @@ buildscript { } dependencies { classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT' - classpath 'com.android.tools.build:gradle:0.4' + classpath 'com.android.tools.build:gradle:0.5.+' } } apply plugin: 'android' apply plugin: 'kotlin-android' dependencies { - compile files('libs/android-support-v4.jar') + compile project(':LibAlfa') } android { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/build.gradle new file mode 100644 index 00000000000..ff389683bb8 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/build.gradle @@ -0,0 +1,32 @@ +buildscript { + repositories { + mavenCentral() + maven { + url 'file://' + pathToKotlinPlugin + } + } + dependencies { + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT' + classpath 'com.android.tools.build:gradle:0.5.+' + } +} +apply plugin: 'android-library' +apply plugin: 'kotlin-android' + +repositories { + mavenCentral() +} + +dependencies { + compile files('libs/android-support-v4.jar') +} + +android { + compileSdkVersion 17 + buildToolsVersion "17.0.0" + + defaultConfig { + minSdkVersion 7 + targetSdkVersion 16 + } +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/libs/android-support-v4.jar b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/libs/android-support-v4.jar similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/libs/android-support-v4.jar rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/libs/android-support-v4.jar diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..2912d2b0ef7 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/ic_launcher-web.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/ic_launcher-web.png new file mode 100644 index 00000000000..4b14629c415 Binary files /dev/null and b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/ic_launcher-web.png differ diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/android/libalfa/LibMainActivity.java b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/android/libalfa/LibMainActivity.java new file mode 100644 index 00000000000..1adeed04b9a --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/android/libalfa/LibMainActivity.java @@ -0,0 +1,23 @@ +package org.jetbrains.kotlin.gradle.test.android.libalfa; + +import android.os.Bundle; +import android.app.Activity; +import android.view.Menu; + +public class LibMainActivity extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.lib_activity_main); + } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.lib_main, menu); + return true; + } + +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/kotlin/Foo.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/kotlin/Foo.kt new file mode 100644 index 00000000000..f23d7f69d2f --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/kotlin/Foo.kt @@ -0,0 +1,2 @@ +fun foo() { +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-hdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 00000000000..c1b44ccc80f Binary files /dev/null and b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-mdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 00000000000..a1bf709d3b4 Binary files /dev/null and b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-xhdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 00000000000..3b5ae5b2add Binary files /dev/null and b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-xxhdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 00000000000..b7df51b1eec Binary files /dev/null and b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/layout/lib_activity_main.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/layout/lib_activity_main.xml new file mode 100644 index 00000000000..99e19f3803c --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/layout/lib_activity_main.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/menu/lib_main.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/menu/lib_main.xml new file mode 100644 index 00000000000..f3b10b6c021 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/menu/lib_main.xml @@ -0,0 +1,6 @@ + + + diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-sw600dp/dimens.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-sw600dp/dimens.xml new file mode 100644 index 00000000000..886b05fa964 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-sw600dp/dimens.xml @@ -0,0 +1,4 @@ + + + diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-sw720dp-land/dimens.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-sw720dp-land/dimens.xml new file mode 100644 index 00000000000..00059fc5c3f --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-sw720dp-land/dimens.xml @@ -0,0 +1,5 @@ + + + 128dp + diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-v11/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-v11/styles.xml new file mode 100644 index 00000000000..3c02242ad04 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-v11/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-v14/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-v14/styles.xml new file mode 100644 index 00000000000..a91fd0372b2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-v14/styles.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/dimens.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/dimens.xml new file mode 100644 index 00000000000..47c82246738 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/strings.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/strings.xml new file mode 100644 index 00000000000..4a866fdadcb --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/strings.xml @@ -0,0 +1,8 @@ + + + + LibAlfa + Settings + Hello world! + + diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/styles.xml new file mode 100644 index 00000000000..6ce89c7ba43 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/styles.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle index d2866b240ea..77659c2f96d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle @@ -1 +1 @@ -include ':AndroidAlfa' +include ':AndroidAlfa', ':LibAlfa'