diff --git a/libraries/tools/kotlin-gradle-android-plugin/.gitignore b/libraries/tools/kotlin-gradle-android-plugin/.gitignore new file mode 100644 index 00000000000..b97b22398a9 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/.gitignore @@ -0,0 +1 @@ +local-repo diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/com/google/common/base/annotations.xml new file mode 100644 index 00000000000..69ed1be5713 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/com/google/common/base/annotations.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/com/google/common/io/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/com/google/common/io/annotations.xml new file mode 100644 index 00000000000..64ac65dcca1 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/com/google/common/io/annotations.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/annotations.xml new file mode 100644 index 00000000000..dc5cd1bbcbe --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/annotations.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/artifacts/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/artifacts/annotations.xml new file mode 100644 index 00000000000..885acfdd4ab --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/artifacts/annotations.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/artifacts/dsl/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/artifacts/dsl/annotations.xml new file mode 100644 index 00000000000..0402ed182e0 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/artifacts/dsl/annotations.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/file/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/file/annotations.xml new file mode 100644 index 00000000000..dea5cec6774 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/file/annotations.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml new file mode 100644 index 00000000000..4005fe3c2c3 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/internal/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/internal/annotations.xml new file mode 100644 index 00000000000..c14ebed20ae --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/internal/annotations.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml new file mode 100644 index 00000000000..6595499a4a1 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml new file mode 100644 index 00000000000..87c8bc5da18 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/plugins/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/plugins/annotations.xml new file mode 100644 index 00000000000..5859b33807e --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/plugins/annotations.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/tasks/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/tasks/annotations.xml new file mode 100644 index 00000000000..67bc433ea20 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/tasks/annotations.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml new file mode 100644 index 00000000000..812dfa500fa --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/pom.xml b/libraries/tools/kotlin-gradle-android-plugin/pom.xml new file mode 100644 index 00000000000..cf49bc1a651 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/pom.xml @@ -0,0 +1,129 @@ + + + + + 4.0.0 + + 3.0.4 + + + + org.jetbrains.kotlin + kotlin-project + 0.1-SNAPSHOT + ../../pom.xml + + + kotlin-gradle-android-plugin + jar + + + + com.android.tools.build + gradle + 0.4.2 + provided + + + org.jetbrains.kotlin + kotlin-stdlib + ${project.version} + + + org.jetbrains.kotlin + kotlin-gradle-plugin-core + ${project.version} + + + org.jetbrains.kotlin + kotlin-jdk-annotations + ${project.version} + + + org.jetbrains.kotlin + gradle-api + 1.4 + provided + + + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/test/kotlin + + + + ${project.basedir}/src/main/resources + true + + + + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${project.version} + + + ${basedir}/kotlinAnnotation + + + + + + compile + compile + compile + + + + test-compile + test-compile + test-compile + + + + + + maven-invoker-plugin + 1.8 + + ${project.build.directory}/it + local-repo + verify + + + + create_local + pre-integration-test + + install + + + + + + maven-failsafe-plugin + 2.6 + + + + integration-test + verify + + + + + + + + + + jetbrains-utils + http://repository.jetbrains.com/utils + + + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt b/libraries/tools/kotlin-gradle-android-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt new file mode 100644 index 00000000000..bbc7b1b3901 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt @@ -0,0 +1,28 @@ +package org.jetbrains.kotlin.gradle.plugin + +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.artifacts.dsl.DependencyHandler +import org.gradle.api.artifacts.ConfigurationContainer +import org.gradle.api.artifacts.Dependency +import org.gradle.api.specs.Spec +import java.io.File +import java.net.URL +import org.gradle.api.logging.Logging +import java.util.Properties +import java.io.FileNotFoundException + +open class KotlinAndroidPlugin: Plugin { + + val log = Logging.getLogger(getClass())!! + + public override fun apply(project: Project) { + + } +} + +open class KSpec(val predicate: (T) -> Boolean): Spec { + public override fun isSatisfiedBy(p0: T?): Boolean { + return p0 != null && predicate(p0) + } +} diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/main/resources/META-INF/gradle-plugins/kotlin.properties b/libraries/tools/kotlin-gradle-android-plugin/src/main/resources/META-INF/gradle-plugins/kotlin.properties new file mode 100644 index 00000000000..18561a8288f --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/main/resources/META-INF/gradle-plugins/kotlin.properties @@ -0,0 +1 @@ +implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPlugin \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/main/resources/project.properties b/libraries/tools/kotlin-gradle-android-plugin/src/main/resources/project.properties new file mode 100644 index 00000000000..e362614406a --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/main/resources/project.properties @@ -0,0 +1 @@ +project.version=${project.version} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt b/libraries/tools/kotlin-gradle-android-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt new file mode 100644 index 00000000000..3d87abf020c --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt @@ -0,0 +1,126 @@ +package org.jetbrains.kotlin.gradle + +import com.google.common.io.Files +import com.intellij.openapi.util.SystemInfo +import java.io.File +import java.util.Arrays +import java.util.Scanner +import org.junit.Before +import org.junit.After +import org.junit.Test +import kotlin.test.assertTrue +import kotlin.test.assertEquals +import kotlin.test.fail +import org.gradle.testfixtures.ProjectBuilder + +class KotlinAndroidGradleIT { + + var workingDir: File = File(".") + + Before fun setUp() { + workingDir = Files.createTempDir() + workingDir.mkdirs() + copyRecursively(File("src/test/resources/testProject/AndroidAlfaProject"), workingDir) + } + + + After fun tearDown() { + deleteRecursively(workingDir) + } + + Test fun testSimpleCompile() { + val projectDir = File(workingDir, "AndroidAlfaProject") + + val pathToKotlinPlugin = "-PpathToKotlinPlugin=" + File("local-repo").getAbsolutePath() + val cmd = if (SystemInfo.isWindows) + listOf("cmd", "/C", "gradlew.bat", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon", "--debug") + else + listOf("/bin/bash", "./gradlew", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon", "--debug") + + val builder = ProcessBuilder(cmd) + builder.directory(projectDir) + builder.redirectErrorStream(true) + val process = builder.start() + + val s = Scanner(process.getInputStream()!!) + val text = StringBuilder() + while (s.hasNextLine()) { + text append s.nextLine() + text append "\n" + } + s.close() + + val result = process.waitFor() + val buildOutput = text.toString() + + println(buildOutput) + + assertEquals(result, 0) + assertTrue(buildOutput.contains(":compileKotlin"), "Should contain ':compileKotlin'") + assertTrue(buildOutput.contains(":compileTestKotlin"), "Should contain ':compileTestKotlin'") + assertTrue(buildOutput.contains(":compileDeployKotlin"), "Should contain ':compileDeployKotlin'") + assertTrue(File(projectDir, "build/reports/tests/demo.TestSource.html").exists(), "Test report does not exist. Were tests executed?") + + // Run the build second time, assert everything is up-to-date + + val up2dateBuilder = ProcessBuilder(cmd) + up2dateBuilder.directory(projectDir) + up2dateBuilder.redirectErrorStream(true) + val up2dateProcess = up2dateBuilder.start() + + val up2dateProcessScanner = Scanner(up2dateProcess.getInputStream()!!) + val up2dateText = StringBuilder() + while (up2dateProcessScanner.hasNextLine()) { + up2dateText append up2dateProcessScanner.nextLine() + up2dateText append "\n" + } + up2dateProcessScanner.close() + + val up2dateResult = up2dateProcess.waitFor() + val up2dateBuildOutput = up2dateText.toString() + + println(up2dateBuildOutput) + + assertEquals(up2dateResult, 0) + assertTrue(up2dateBuildOutput.contains(":compileKotlin UP-TO-DATE"), "Should contain ':compileKotlin UP-TO-DATE'") + assertTrue(up2dateBuildOutput.contains(":compileTestKotlin UP-TO-DATE"), "Should contain ':compileTestKotlin UP-TO-DATE'") + assertTrue(up2dateBuildOutput.contains(":compileDeployKotlin UP-TO-DATE"), "Should contain ':compileDeployKotlin UP-TO-DATE'") + assertTrue(up2dateBuildOutput.contains(":compileJava UP-TO-DATE"), "Should contain ':compileJava UP-TO-DATE'") + } + + + fun copyRecursively(source: File, target: File) { + assertTrue(target.isDirectory()) + val targetFile = File(target, source.getName()) + if (source.isDirectory()) { + targetFile.mkdir() + val array = source.listFiles() + if (array != null) { + for (child in array) { + copyRecursively(child, targetFile) + } + } + } else { + Files.copy(source, targetFile) + } + } + + + fun deleteRecursively(f: File): Unit { + if (f.isDirectory()) { + val children = f.listFiles() + if (children != null) { + for (child in children) { + deleteRecursively(child) + } + } + val shouldBeEmpty = f.listFiles() + if (shouldBeEmpty != null) { + assertTrue(shouldBeEmpty.isEmpty()) + } else { + fail("Error listing directory content") + } + } + f.delete() + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle new file mode 100644 index 00000000000..ec9bcd7e87e --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle @@ -0,0 +1,28 @@ +buildscript { + repositories { + mavenCentral() + maven { + url 'file://' + pathToKotlinPlugin + } + } + dependencies { + classpath 'org.jetbrains.kotlin:kotlin-gradle-android-plugin:0.1-SNAPSHOT' + classpath 'com.android.tools.build:gradle:0.4' + } +} +apply plugin: 'android' +apply plugin: 'kotlin' + +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-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/libs/android-support-v4.jar b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/libs/android-support-v4.jar new file mode 100644 index 00000000000..428bdbc02a1 Binary files /dev/null and b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/libs/android-support-v4.jar differ diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..377e183029c --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java new file mode 100644 index 00000000000..df46cf92ddf --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java @@ -0,0 +1,34 @@ +package org.jetbrains.kotlin.gradle.test.androidalfa; + +import android.content.Intent; +import android.os.Bundle; +import android.app.Activity; +import android.view.Menu; +import android.view.View; +import android.widget.Button; + +public class MainActivity extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + Button next = (Button) findViewById(R.id.Button01); + next.setOnClickListener(new View.OnClickListener() { + public void onClick(View view) { + Intent myIntent = new Intent(view.getContext(), MainActivity2.class); + startActivityForResult(myIntent, 0); + } + }); + } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + +} diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt new file mode 100644 index 00000000000..8e3438cbe5d --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt @@ -0,0 +1,36 @@ +package org.jetbrains.kotlin.gradle.test.androidalfa; + +import android.content.Intent; +import android.os.Bundle; +import android.app.Activity; +import android.view.Menu; +import android.view.View; +import android.widget.Button; + +public class MainActivity2 extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main2); + + Button next = (Button) findViewById(R.id.Button02); + next.setOnClickListener(new View.OnClickListener() { + public void onClick(View view) { + Intent intent = new Intent(); + setResult(RESULT_OK, intent); + finish(); + } + + }); + } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main_activity2, menu); + return true; + } + +} diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-hdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 00000000000..96a442e5b8e Binary files /dev/null and b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-mdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 00000000000..359047dfa4e Binary files /dev/null and b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-xhdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 00000000000..71c6d760f05 Binary files /dev/null and b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main.xml b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000000..ede57c3902f --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main2.xml b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main2.xml new file mode 100644 index 00000000000..d707536a92f --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main2.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main.xml b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main.xml new file mode 100644 index 00000000000..f3b10b6c021 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main.xml @@ -0,0 +1,6 @@ + + + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main_activity2.xml b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main_activity2.xml new file mode 100644 index 00000000000..f3b10b6c021 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main_activity2.xml @@ -0,0 +1,6 @@ + + + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw600dp/dimens.xml b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw600dp/dimens.xml new file mode 100644 index 00000000000..886b05fa964 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw600dp/dimens.xml @@ -0,0 +1,4 @@ + + + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw720dp-land/dimens.xml b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw720dp-land/dimens.xml new file mode 100644 index 00000000000..00059fc5c3f --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw720dp-land/dimens.xml @@ -0,0 +1,5 @@ + + + 128dp + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v11/styles.xml b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v11/styles.xml new file mode 100644 index 00000000000..3c02242ad04 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v11/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v14/styles.xml b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v14/styles.xml new file mode 100644 index 00000000000..a91fd0372b2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v14/styles.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/dimens.xml b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/dimens.xml new file mode 100644 index 00000000000..47c82246738 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/strings.xml b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/strings.xml new file mode 100644 index 00000000000..afffaa8a836 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/strings.xml @@ -0,0 +1,10 @@ + + + + AndroidAlfa + Settings + Hello world! + MainActivity1 + MainActivity2 + + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/styles.xml b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/styles.xml new file mode 100644 index 00000000000..6ce89c7ba43 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/styles.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/build.gradle b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/build.gradle new file mode 100644 index 00000000000..495c5038ea6 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/build.gradle @@ -0,0 +1 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.jar b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000000..8c0fb64a869 Binary files /dev/null and b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.jar differ diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.properties b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..5c22dec0647 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew new file mode 100644 index 00000000000..91a7e269e19 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew.bat b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew.bat new file mode 100644 index 00000000000..8a0b282aa68 --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/local.properties b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/local.properties new file mode 100644 index 00000000000..c47520a1bed --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/local.properties @@ -0,0 +1,10 @@ +# This file is automatically generated by Android Studio. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +sdk.dir=C:/Program Files (x86)/Android/android-studio/sdk \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle new file mode 100644 index 00000000000..d2866b240ea --- /dev/null +++ b/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle @@ -0,0 +1 @@ +include ':AndroidAlfa'