From 3aa6f80eec4e922add92646a5d5547b6db82cc4b Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Wed, 18 Sep 2019 15:10:24 +0200 Subject: Move gradle-integration-tests to new module --- .../testData/androidApp/app/build.gradle | 45 +++++++++++++ .../androidApp/app/src/main/AndroidManifest.xml | 26 +++++++ .../org/example/kotlin/mixed/JavaActivity.java | 34 ++++++++++ .../org/example/kotlin/mixed/KotlinActivity.kt | 28 ++++++++ .../app/src/main/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 9397 bytes .../app/src/main/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 5237 bytes .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 14383 bytes .../app/src/main/res/layout/activity_main.xml | 24 +++++++ .../app/src/main/res/layout/activity_main2.xml | 24 +++++++ .../androidApp/app/src/main/res/menu/main.xml | 6 ++ .../app/src/main/res/menu/main_activity2.xml | 6 ++ .../androidApp/app/src/main/res/values/dimens.xml | 5 ++ .../androidApp/app/src/main/res/values/strings.xml | 10 +++ .../androidApp/app/src/main/res/values/styles.xml | 20 ++++++ .../testData/androidApp/build.gradle | 21 ++++++ .../testData/androidApp/fileTree.txt | 20 ++++++ .../testData/androidApp/settings.gradle | 3 + .../testData/androidAppJavadoc/app/build.gradle | 49 ++++++++++++++ .../app/src/main/AndroidManifest.xml | 26 +++++++ .../org/example/kotlin/mixed/JavaActivity.java | 34 ++++++++++ .../org/example/kotlin/mixed/KotlinActivity.kt | 28 ++++++++ .../app/src/main/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 9397 bytes .../app/src/main/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 5237 bytes .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 14383 bytes .../app/src/main/res/layout/activity_main.xml | 24 +++++++ .../app/src/main/res/layout/activity_main2.xml | 24 +++++++ .../app/src/main/res/menu/main.xml | 6 ++ .../app/src/main/res/menu/main_activity2.xml | 6 ++ .../app/src/main/res/values/dimens.xml | 5 ++ .../app/src/main/res/values/strings.xml | 10 +++ .../app/src/main/res/values/styles.xml | 20 ++++++ .../testData/androidAppJavadoc/build.gradle | 21 ++++++ .../testData/androidAppJavadoc/fileTree.txt | 21 ++++++ .../testData/androidAppJavadoc/settings.gradle | 3 + .../androidLibDependsOnJavaLib/build.gradle | 20 ++++++ .../androidLibDependsOnJavaLib/fileTree.txt | 14 ++++ .../androidLibDependsOnJavaLib/jlib/build.gradle | 1 + .../jlib/src/main/java/example/jlib/LibClz.java | 5 ++ .../androidLibDependsOnJavaLib/lib/build.gradle | 39 +++++++++++ .../lib/src/main/AndroidManifest.xml | 4 ++ .../lib/src/main/kotlin/example/LibClzUse.kt | 13 ++++ .../androidLibDependsOnJavaLib/package-list | 1 + .../androidLibDependsOnJavaLib/settings.gradle | 5 ++ .../androidMultiFlavourApp/app/build.gradle | 75 +++++++++++++++++++++ .../app/src/free/AndroidManifest.xml | 9 +++ .../org/example/kotlin/mixed/free/AdActivity.kt | 14 ++++ .../app/src/free/res/layout/activity_ad.xml | 24 +++++++ .../app/src/free/res/values/strings.xml | 3 + .../app/src/main/AndroidManifest.xml | 26 +++++++ .../org/example/kotlin/mixed/JavaActivity.java | 34 ++++++++++ .../org/example/kotlin/mixed/KotlinActivity.kt | 28 ++++++++ .../app/src/main/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 9397 bytes .../app/src/main/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 5237 bytes .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 14383 bytes .../app/src/main/res/layout/activity_main.xml | 24 +++++++ .../app/src/main/res/layout/activity_main2.xml | 24 +++++++ .../app/src/main/res/menu/main.xml | 6 ++ .../app/src/main/res/menu/main_activity2.xml | 6 ++ .../app/src/main/res/values/dimens.xml | 5 ++ .../app/src/main/res/values/strings.xml | 10 +++ .../app/src/main/res/values/styles.xml | 20 ++++++ .../testData/androidMultiFlavourApp/build.gradle | 21 ++++++ .../testData/androidMultiFlavourApp/fileTree.txt | 47 +++++++++++++ .../androidMultiFlavourApp/settings.gradle | 3 + .../testData/basic/build.gradle | 42 ++++++++++++ .../testData/basic/classDir/p1/MyBinaryClass.class | Bin 0 -> 670 bytes .../testData/basic/fileTree.txt | 33 +++++++++ .../testData/basic/settings.gradle | 1 + .../basic/src/main/kotlin/demo/HelloWorld.kt | 45 +++++++++++++ .../testData/multiProjectSingleOut/build.gradle | 37 ++++++++++ .../testData/multiProjectSingleOut/fileTree.txt | 33 +++++++++ .../testData/multiProjectSingleOut/settings.gradle | 3 + .../multiProjectSingleOut/subA/build.gradle | 6 ++ .../subA/src/main/kotlin/module.kt | 31 +++++++++ .../multiProjectSingleOut/subB/build.gradle | 7 ++ .../subB/src/main/kotlin/module.kt | 31 +++++++++ .../testData/multiplatformProject/build.gradle | 60 +++++++++++++++++ .../testData/multiplatformProject/fileTree.txt | 18 +++++ .../testData/multiplatformProject/settings.gradle | 1 + .../src/jsMain/kotlin/org/kotlintestmpp/main.kt | 14 ++++ .../src/jvmMain/kotlin/org/kotlintestmpp/main.kt | 20 ++++++ .../testData/sourcesChange/build.gradle | 35 ++++++++++ .../testData/sourcesChange/fileTree.txt | 10 +++ .../testData/sourcesChange/fileTree1.txt | 11 +++ .../testData/sourcesChange/settings.gradle | 1 + .../src/main/kotlin/demo/HelloWorld.kt | 6 ++ .../src1/main/kotlin/demo/HelloWorld.kt | 11 +++ .../testData/typeSafeConfiguration/build.gradle | 73 ++++++++++++++++++++ .../testData/typeSafeConfiguration/settings.gradle | 1 + 89 files changed, 1560 insertions(+) create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/AndroidManifest.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-hdpi/ic_launcher.png create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-mdpi/ic_launcher.png create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-xhdpi/ic_launcher.png create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main2.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main_activity2.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/dimens.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/strings.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/styles.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/fileTree.txt create mode 100644 integration-tests/gradle-integration-tests/testData/androidApp/settings.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/AndroidManifest.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-hdpi/ic_launcher.png create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-mdpi/ic_launcher.png create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-xhdpi/ic_launcher.png create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main2.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main_activity2.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/dimens.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/strings.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/styles.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/fileTree.txt create mode 100644 integration-tests/gradle-integration-tests/testData/androidAppJavadoc/settings.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/fileTree.txt create mode 100644 integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/src/main/java/example/jlib/LibClz.java create mode 100644 integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/kotlin/example/LibClzUse.kt create mode 100644 integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/package-list create mode 100644 integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/settings.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/AndroidManifest.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/kotlin/org/example/kotlin/mixed/free/AdActivity.kt create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/layout/activity_ad.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/values/strings.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/AndroidManifest.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-hdpi/ic_launcher.png create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-mdpi/ic_launcher.png create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-xhdpi/ic_launcher.png create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/layout/activity_main.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/layout/activity_main2.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/menu/main.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/menu/main_activity2.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/dimens.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/strings.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/styles.xml create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt create mode 100644 integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/settings.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/basic/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/basic/classDir/p1/MyBinaryClass.class create mode 100644 integration-tests/gradle-integration-tests/testData/basic/fileTree.txt create mode 100644 integration-tests/gradle-integration-tests/testData/basic/settings.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/basic/src/main/kotlin/demo/HelloWorld.kt create mode 100644 integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/fileTree.txt create mode 100644 integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/settings.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subA/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subA/src/main/kotlin/module.kt create mode 100644 integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subB/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subB/src/main/kotlin/module.kt create mode 100644 integration-tests/gradle-integration-tests/testData/multiplatformProject/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/multiplatformProject/fileTree.txt create mode 100644 integration-tests/gradle-integration-tests/testData/multiplatformProject/settings.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/multiplatformProject/src/jsMain/kotlin/org/kotlintestmpp/main.kt create mode 100644 integration-tests/gradle-integration-tests/testData/multiplatformProject/src/jvmMain/kotlin/org/kotlintestmpp/main.kt create mode 100644 integration-tests/gradle-integration-tests/testData/sourcesChange/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree.txt create mode 100644 integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree1.txt create mode 100644 integration-tests/gradle-integration-tests/testData/sourcesChange/settings.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/sourcesChange/src/main/kotlin/demo/HelloWorld.kt create mode 100644 integration-tests/gradle-integration-tests/testData/sourcesChange/src1/main/kotlin/demo/HelloWorld.kt create mode 100644 integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle create mode 100644 integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/settings.gradle (limited to 'integration-tests/gradle-integration-tests/testData') diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/build.gradle b/integration-tests/gradle-integration-tests/testData/androidApp/app/build.gradle new file mode 100644 index 00000000..2420107c --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/build.gradle @@ -0,0 +1,45 @@ +buildscript { + repositories { + jcenter() + mavenLocal() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version" + } +} + +plugins { + id 'org.jetbrains.dokka' +} + + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion Integer.parseInt(sdk_version) + buildToolsVersion abt_version + + defaultConfig { + applicationId "org.example.kotlin.mixed" + minSdkVersion 14 + targetSdkVersion Integer.parseInt(sdk_version) + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt') + } + } + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } +} + +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$test_kotlin_version" + dokkaRuntime files(dokka_fatjar) +} \ No newline at end of file diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..b4e1a892 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java new file mode 100644 index 00000000..3668c594 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java @@ -0,0 +1,34 @@ +package org.example.kotlin.mixed; + +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 JavaActivity 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(), KotlinActivity.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/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt new file mode 100644 index 00000000..ca2f27b0 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt @@ -0,0 +1,28 @@ +package org.example.kotlin.mixed + +import android.content.Intent +import android.os.Bundle +import android.app.Activity +import android.view.Menu +import android.widget.Button + +class KotlinActivity : Activity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main2) + + val next = findViewById(R.id.Button02) as Button + next.setOnClickListener { + val intent: Intent = Intent() + setResult(RESULT_OK, intent) + finish() + } + } + + override fun onCreateOptionsMenu(menu: Menu?): Boolean { + // Inflate the menu; this adds items to the action bar if it is present. + menuInflater.inflate(R.menu.main_activity2, menu) + return true + } +} diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-hdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 00000000..96a442e5 Binary files /dev/null and b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-mdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 00000000..359047df Binary files /dev/null and b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-xhdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 00000000..71c6d760 Binary files /dev/null and b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..ede57c39 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main2.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main2.xml new file mode 100644 index 00000000..d707536a --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main2.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main.xml new file mode 100644 index 00000000..f3b10b6c --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main.xml @@ -0,0 +1,6 @@ + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main_activity2.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main_activity2.xml new file mode 100644 index 00000000..f3b10b6c --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main_activity2.xml @@ -0,0 +1,6 @@ + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/dimens.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/dimens.xml new file mode 100644 index 00000000..47c82246 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/strings.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..d8f08bc2 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/strings.xml @@ -0,0 +1,10 @@ + + + + AndroidSample + Settings + Hello world! + JavaActivity + KotlinActivity + + diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/styles.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..6ce89c7b --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/styles.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/build.gradle b/integration-tests/gradle-integration-tests/testData/androidApp/build.gradle new file mode 100644 index 00000000..35356b90 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/build.gradle @@ -0,0 +1,21 @@ +buildscript { + repositories { + mavenCentral() + jcenter() + maven { url 'https://maven.google.com' } + maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" } + maven { url "https://dl.bintray.com/kotlin/kotlin-dev" } + } + dependencies { + classpath "com.android.tools.build:gradle:$abt_plugin_version" + } +} + +allprojects { + repositories { + mavenCentral() + jcenter() + maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" } + maven { url "https://dl.bintray.com/kotlin/kotlin-dev" } + } +} diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/fileTree.txt b/integration-tests/gradle-integration-tests/testData/androidApp/fileTree.txt new file mode 100644 index 00000000..f66c79e3 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/fileTree.txt @@ -0,0 +1,20 @@ +/ + app/ + alltypes/ + index.html + index-outline.html + index.html + org.example.kotlin.mixed/ + -java-activity/ + -init-.html + index.html + on-create-options-menu.html + on-create.html + -kotlin-activity/ + -init-.html + index.html + on-create-options-menu.html + on-create.html + index.html + package-list + style.css diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/settings.gradle b/integration-tests/gradle-integration-tests/testData/androidApp/settings.gradle new file mode 100644 index 00000000..1feb2867 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidApp/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = "androidApp" + +include ':app' \ No newline at end of file diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle new file mode 100644 index 00000000..66421f52 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle @@ -0,0 +1,49 @@ +buildscript { + repositories { + jcenter() + mavenLocal() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version" + } +} + +plugins { + id 'org.jetbrains.dokka' +} + + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' + +android { + compileSdkVersion Integer.parseInt(sdk_version) + buildToolsVersion abt_version + + defaultConfig { + applicationId "org.example.kotlin.mixed" + minSdkVersion 14 + targetSdkVersion Integer.parseInt(sdk_version) + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt') + } + } + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } +} + +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$test_kotlin_version" + dokkaRuntime files(dokka_fatjar) +} + + +dokka { + outputFormat = "javadoc" +} \ No newline at end of file diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..b4e1a892 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java new file mode 100644 index 00000000..3668c594 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java @@ -0,0 +1,34 @@ +package org.example.kotlin.mixed; + +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 JavaActivity 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(), KotlinActivity.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/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt new file mode 100644 index 00000000..ca2f27b0 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt @@ -0,0 +1,28 @@ +package org.example.kotlin.mixed + +import android.content.Intent +import android.os.Bundle +import android.app.Activity +import android.view.Menu +import android.widget.Button + +class KotlinActivity : Activity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main2) + + val next = findViewById(R.id.Button02) as Button + next.setOnClickListener { + val intent: Intent = Intent() + setResult(RESULT_OK, intent) + finish() + } + } + + override fun onCreateOptionsMenu(menu: Menu?): Boolean { + // Inflate the menu; this adds items to the action bar if it is present. + menuInflater.inflate(R.menu.main_activity2, menu) + return true + } +} diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-hdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 00000000..96a442e5 Binary files /dev/null and b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-mdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 00000000..359047df Binary files /dev/null and b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-xhdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 00000000..71c6d760 Binary files /dev/null and b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..ede57c39 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main2.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main2.xml new file mode 100644 index 00000000..d707536a --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main2.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main.xml new file mode 100644 index 00000000..f3b10b6c --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main.xml @@ -0,0 +1,6 @@ + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main_activity2.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main_activity2.xml new file mode 100644 index 00000000..f3b10b6c --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main_activity2.xml @@ -0,0 +1,6 @@ + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/dimens.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/dimens.xml new file mode 100644 index 00000000..47c82246 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/strings.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..d8f08bc2 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/strings.xml @@ -0,0 +1,10 @@ + + + + AndroidSample + Settings + Hello world! + JavaActivity + KotlinActivity + + diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/styles.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..6ce89c7b --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/styles.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/build.gradle b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/build.gradle new file mode 100644 index 00000000..35356b90 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/build.gradle @@ -0,0 +1,21 @@ +buildscript { + repositories { + mavenCentral() + jcenter() + maven { url 'https://maven.google.com' } + maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" } + maven { url "https://dl.bintray.com/kotlin/kotlin-dev" } + } + dependencies { + classpath "com.android.tools.build:gradle:$abt_plugin_version" + } +} + +allprojects { + repositories { + mavenCentral() + jcenter() + maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" } + maven { url "https://dl.bintray.com/kotlin/kotlin-dev" } + } +} diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/fileTree.txt b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/fileTree.txt new file mode 100644 index 00000000..c5e79eba --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/fileTree.txt @@ -0,0 +1,21 @@ +/ + allclasses-frame.html + allclasses-noframe.html + constant-values.html + deprecated-list.html + help-doc.html + index-all.html + index.html + org/ + example/ + kotlin/ + mixed/ + JavaActivity.html + KotlinActivity.html + package-frame.html + package-summary.html + package-tree.html + overview-tree.html + package-list + script.js + stylesheet.css diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/settings.gradle b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/settings.gradle new file mode 100644 index 00000000..a4e67fea --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = "androidAppJavadoc" + +include ':app' \ No newline at end of file diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/build.gradle b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/build.gradle new file mode 100644 index 00000000..736668ab --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/build.gradle @@ -0,0 +1,20 @@ +subprojects { + buildscript { + repositories { + mavenCentral() + jcenter() + maven { url 'https://maven.google.com' } + maven { url "https://dl.bintray.com/kotlin/kotlin-eap/" } + maven { url "https://dl.bintray.com/kotlin/kotlin-dev" } + } + + } + + repositories { + mavenCentral() + jcenter() + maven { url 'https://maven.google.com' } + maven { url "https://dl.bintray.com/kotlin/kotlin-eap/" } + maven { url "https://dl.bintray.com/kotlin/kotlin-dev" } + } +} \ No newline at end of file diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/fileTree.txt b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/fileTree.txt new file mode 100644 index 00000000..6c96a01c --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/fileTree.txt @@ -0,0 +1,14 @@ +/ + lib/ + alltypes/ + index.html + example/ + -lib-clz-use/ + -init-.html + f.html + index.html + index.html + index-outline.html + index.html + package-list + style.css diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/build.gradle b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/build.gradle new file mode 100644 index 00000000..bbfeb03c --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/build.gradle @@ -0,0 +1 @@ +apply plugin: 'java' diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/src/main/java/example/jlib/LibClz.java b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/src/main/java/example/jlib/LibClz.java new file mode 100644 index 00000000..1d9a6fb2 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/src/main/java/example/jlib/LibClz.java @@ -0,0 +1,5 @@ +package example.jlib; + +public class LibClz { + +} \ No newline at end of file diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle new file mode 100644 index 00000000..b1ee52ab --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle @@ -0,0 +1,39 @@ +buildscript { + dependencies { + classpath "com.android.tools.build:gradle:$abt_plugin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version" + } +} + + +plugins { + id 'org.jetbrains.dokka' +} + + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' + + +android { + compileSdkVersion Integer.parseInt(sdk_version) + buildToolsVersion abt_version + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } +} + +dependencies { + api(project(":jlib")) + dokkaRuntime files(dokka_fatjar) +} + +dokka { + configuration { + externalDocumentationLink { + url = new URL("https://example.com") + packageListUrl = file("$rootDir/package-list").toURI().toURL() + } + } +} \ No newline at end of file diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml new file mode 100644 index 00000000..267f6efd --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/kotlin/example/LibClzUse.kt b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/kotlin/example/LibClzUse.kt new file mode 100644 index 00000000..d034a3a9 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/kotlin/example/LibClzUse.kt @@ -0,0 +1,13 @@ +package example + +import example.jlib.LibClz + +/** + * Uses jlib + */ +class LibClzUse { + /** + * Returns LibClz + */ + fun f(): LibClz = LibClz() +} \ No newline at end of file diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/package-list b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/package-list new file mode 100644 index 00000000..bf76058e --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/package-list @@ -0,0 +1 @@ +example.jlib \ No newline at end of file diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/settings.gradle b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/settings.gradle new file mode 100644 index 00000000..5b4250a0 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/settings.gradle @@ -0,0 +1,5 @@ +rootProject.name = "androidLibDependsOnJavaLib" + + +include(":lib") +include(":jlib") \ No newline at end of file diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle new file mode 100644 index 00000000..660257ab --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle @@ -0,0 +1,75 @@ +buildscript { + repositories { + jcenter() + mavenLocal() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version" + } +} + +plugins { + id 'org.jetbrains.dokka' +} + + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion Integer.parseInt(sdk_version) + buildToolsVersion abt_version + + defaultConfig { + applicationId "org.example.kotlin.mixed" + minSdkVersion 14 + targetSdkVersion Integer.parseInt(sdk_version) + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt') + } + } + + flavorDimensions "mode" + productFlavors { + free { + dimension "mode" + applicationIdSuffix ".free" + versionNameSuffix "-free" + } + full { + dimension "mode" + applicationIdSuffix ".full" + versionNameSuffix "-full" + } + } + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + free.java.srcDirs += 'src/free/kotlin' + } +} + +dependencies { + compile "org.jetbrains.kotlin:kotlin-stdlib:$test_kotlin_version" + dokkaRuntime files(dokka_fatjar) +} + + +dokka { + outputDirectory = "$buildDir/dokka/all" +} + +task dokkaFullFlavourOnly(type: org.jetbrains.dokka.gradle.DokkaTask) { + outputDirectory = "$buildDir/dokka/fullOnly" + configuration { + moduleName = "full" + kotlinTasks { + ["compileFullReleaseKotlin"] + } + } +} \ No newline at end of file diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/AndroidManifest.xml new file mode 100644 index 00000000..3ecbcd3a --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/AndroidManifest.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/kotlin/org/example/kotlin/mixed/free/AdActivity.kt b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/kotlin/org/example/kotlin/mixed/free/AdActivity.kt new file mode 100644 index 00000000..b0b980fd --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/kotlin/org/example/kotlin/mixed/free/AdActivity.kt @@ -0,0 +1,14 @@ +package org.example.kotlin.mixed.free + +import android.os.Bundle +import android.app.Activity +import org.example.kotlin.mixed.R + +class AdActivity : Activity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_ad) + } + +} diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/layout/activity_ad.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/layout/activity_ad.xml new file mode 100644 index 00000000..e6443d05 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/layout/activity_ad.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/values/strings.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/values/strings.xml new file mode 100644 index 00000000..bbdf2d06 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/values/strings.xml @@ -0,0 +1,3 @@ + + AdActivity + diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..b4e1a892 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java new file mode 100644 index 00000000..3668c594 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java @@ -0,0 +1,34 @@ +package org.example.kotlin.mixed; + +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 JavaActivity 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(), KotlinActivity.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/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt new file mode 100644 index 00000000..ca2f27b0 --- /dev/null +++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt @@ -0,0 +1,28 @@ +package org.example.kotlin.mixed + +import android.content.Intent +import android.os.Bundle +import android.app.Activity +import android.view.Menu +import android.widget.Button + +class KotlinActivity : Activity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main2) + + val next = findViewById(R.id.Button02) as Button + next.setOnClickListener { + val intent: Intent = Intent() + setResult(RESULT_OK, intent) + finish() + } + } + + override fun onCreateOptionsMenu(menu: Menu?): Boolean { + // Inflate the menu; this adds items to the action bar if it is present. + menuInflater.inflate(R.menu.main_activity2, menu) + return true + } +} diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-hdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 00000000..96a442e5 Binary files /dev/null and b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-mdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 00000000..359047df Binary files /dev/null and b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-xhdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 00000000..71c6d760