diff --git a/compiler/testData/cli/jvm/plugins/pluginSimple.kt b/compiler/testData/cli/jvm/plugins/pluginSimple.kt deleted file mode 100644 index 34573286b09..00000000000 --- a/compiler/testData/cli/jvm/plugins/pluginSimple.kt +++ /dev/null @@ -1,8 +0,0 @@ -import android.view.* -import android.app.* -import android.widget.* -import kotlinx.android.synthetic.main.layout.* - -class MyActivity : Activity() { - init { textView.setText("Some text") } -} \ No newline at end of file diff --git a/compiler/testData/cli/jvm/plugins/pluginSimple_legacy.args b/compiler/testData/cli/jvm/plugins/pluginSimple_legacy.args deleted file mode 100644 index 1a6caac8c39..00000000000 --- a/compiler/testData/cli/jvm/plugins/pluginSimple_legacy.args +++ /dev/null @@ -1,9 +0,0 @@ --d -$TEMP_DIR$ --Xplugin=dist/kotlinc/lib/android-extensions-compiler.jar --P -plugin\:org.jetbrains.kotlin.android\:package=com.myapp --P -plugin\:org.jetbrains.kotlin.android\:variant=main;$TESTDATA_DIR$/../androidPlugin/res -$TESTDATA_DIR$/pluginSimple.kt -$TESTDATA_DIR$/../androidPlugin diff --git a/compiler/testData/cli/jvm/plugins/pluginSimple_legacy.out b/compiler/testData/cli/jvm/plugins/pluginSimple_legacy.out deleted file mode 100644 index a0aba9318ad..00000000000 --- a/compiler/testData/cli/jvm/plugins/pluginSimple_legacy.out +++ /dev/null @@ -1 +0,0 @@ -OK \ No newline at end of file diff --git a/compiler/testData/cli/jvm/plugins/pluginSimple_modern_noK2.args b/compiler/testData/cli/jvm/plugins/pluginSimple_modern_noK2.args deleted file mode 100644 index 1738c20d466..00000000000 --- a/compiler/testData/cli/jvm/plugins/pluginSimple_modern_noK2.args +++ /dev/null @@ -1,5 +0,0 @@ --d -$TEMP_DIR$ --Xcompiler-plugin=dist/kotlinc/lib/android-extensions-compiler.jar=package=com.myapp,variant=main;$TESTDATA_DIR$/../androidPlugin/res -$TESTDATA_DIR$/pluginSimple.kt -$TESTDATA_DIR$/../androidPlugin diff --git a/compiler/testData/cli/jvm/plugins/pluginSimple_modern_noK2.out b/compiler/testData/cli/jvm/plugins/pluginSimple_modern_noK2.out deleted file mode 100644 index 09389a9824c..00000000000 --- a/compiler/testData/cli/jvm/plugins/pluginSimple_modern_noK2.out +++ /dev/null @@ -1,2 +0,0 @@ -error: -Xcompiler-plugin argument is allowed only for for K2 compiler. Please use -Xplugin argument or enable -Xuse-k2 -COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/plugins/pluginWithK2Error.kt b/compiler/testData/cli/jvm/plugins/pluginWithK2Error.kt deleted file mode 100644 index 34573286b09..00000000000 --- a/compiler/testData/cli/jvm/plugins/pluginWithK2Error.kt +++ /dev/null @@ -1,8 +0,0 @@ -import android.view.* -import android.app.* -import android.widget.* -import kotlinx.android.synthetic.main.layout.* - -class MyActivity : Activity() { - init { textView.setText("Some text") } -} \ No newline at end of file diff --git a/compiler/testData/cli/jvm/plugins/pluginWithK2Error_legacy.args b/compiler/testData/cli/jvm/plugins/pluginWithK2Error_legacy.args deleted file mode 100644 index 269d3f68883..00000000000 --- a/compiler/testData/cli/jvm/plugins/pluginWithK2Error_legacy.args +++ /dev/null @@ -1,10 +0,0 @@ --d -$TEMP_DIR$ --Xplugin=dist/kotlinc/lib/android-extensions-compiler.jar --P -plugin\:org.jetbrains.kotlin.android\:package=com.myapp --P -plugin\:org.jetbrains.kotlin.android\:variant=main;$TESTDATA_DIR$/../androidPlugin/res -$TESTDATA_DIR$/pluginSimple.kt -$TESTDATA_DIR$/../androidPlugin --Xuse-k2 diff --git a/compiler/testData/cli/jvm/plugins/pluginWithK2Error_legacy.out b/compiler/testData/cli/jvm/plugins/pluginWithK2Error_legacy.out deleted file mode 100644 index 092c02de5fd..00000000000 --- a/compiler/testData/cli/jvm/plugins/pluginWithK2Error_legacy.out +++ /dev/null @@ -1,7 +0,0 @@ -warning: ATTENTION! - This build uses experimental K2 compiler: - -Xuse-k2 -error: there are some plugins incompatible with K2 compiler: - org.jetbrains.kotlin.android.synthetic.AndroidComponentRegistrar -Please remove -Xuse-k2 -COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/plugins/pluginWithK2Error_modern.args b/compiler/testData/cli/jvm/plugins/pluginWithK2Error_modern.args deleted file mode 100644 index 403fc159fc2..00000000000 --- a/compiler/testData/cli/jvm/plugins/pluginWithK2Error_modern.args +++ /dev/null @@ -1,6 +0,0 @@ --d -$TEMP_DIR$ --Xcompiler-plugin=dist/kotlinc/lib/android-extensions-compiler.jar=package=com.myapp,variant=main;$TESTDATA_DIR$/../androidPlugin/res -$TESTDATA_DIR$/pluginSimple.kt -$TESTDATA_DIR$/../androidPlugin --Xuse-k2 diff --git a/compiler/testData/cli/jvm/plugins/pluginWithK2Error_modern.out b/compiler/testData/cli/jvm/plugins/pluginWithK2Error_modern.out deleted file mode 100644 index 092c02de5fd..00000000000 --- a/compiler/testData/cli/jvm/plugins/pluginWithK2Error_modern.out +++ /dev/null @@ -1,7 +0,0 @@ -warning: ATTENTION! - This build uses experimental K2 compiler: - -Xuse-k2 -error: there are some plugins incompatible with K2 compiler: - org.jetbrains.kotlin.android.synthetic.AndroidComponentRegistrar -Please remove -Xuse-k2 -COMPILATION_ERROR diff --git a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java index 03057e57ef0..2e7d0aa1ac6 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java @@ -103,26 +103,6 @@ public class CliTestGenerated extends AbstractCliTest { public void testNoPluginInClasspath() throws Exception { runTest("compiler/testData/cli/jvm/plugins/noPluginInClasspath.args"); } - - @TestMetadata("pluginSimple_legacy.args") - public void testPluginSimple_legacy() throws Exception { - runTest("compiler/testData/cli/jvm/plugins/pluginSimple_legacy.args"); - } - - @TestMetadata("pluginSimple_modern_noK2.args") - public void testPluginSimple_modern_noK2() throws Exception { - runTest("compiler/testData/cli/jvm/plugins/pluginSimple_modern_noK2.args"); - } - - @TestMetadata("pluginWithK2Error_legacy.args") - public void testPluginWithK2Error_legacy() throws Exception { - runTest("compiler/testData/cli/jvm/plugins/pluginWithK2Error_legacy.args"); - } - - @TestMetadata("pluginWithK2Error_modern.args") - public void testPluginWithK2Error_modern() throws Exception { - runTest("compiler/testData/cli/jvm/plugins/pluginWithK2Error_modern.args"); - } } @TestMetadata("compiler/testData/cli/jvm") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index aeacb8460f8..c2f223996ff 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -69,7 +69,6 @@ dependencies { testImplementation(project(path = ":examples:annotation-processor-example")) testImplementation(kotlinStdlib("jdk8")) - testImplementation(project(":kotlin-android-extensions")) testImplementation(project(":kotlin-parcelize-compiler")) testImplementation(commonDependency("org.jetbrains.intellij.deps", "trove4j")) testImplementation(commonDependency("io.ktor", "ktor-server-test-host")) @@ -82,7 +81,6 @@ dependencies { testImplementation(commonDependency("com.google.code.gson:gson")) testApiJUnit5(vintageEngine = true, jupiterParams = true) - testRuntimeOnly(project(":kotlin-android-extensions")) testRuntimeOnly(project(":compiler:tests-mutes")) // Workaround for missing transitive import of the common(project `kotlin-test-common` diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt index a353491e5f8..e411f3a8689 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt @@ -270,28 +270,6 @@ open class KotlinAndroid36GradleIT : KotlinAndroid3GradleIT() { assertFileExists("app/build/tmp/kotlin-classes/$variant/com/example/app/AKt.class") assertFileExists("app/build/tmp/kotlin-classes/$variant/com/example/app/KtUsageKt.class") } - - // Check that Android extensions arguments are available only in the Android source sets: - val compilerPluginArgsRegex = "(\\w+)${Regex.escape("=args=>")}(.*)".toRegex() - val compilerPluginOptionsBySourceSet = - compilerPluginArgsRegex.findAll(output).associate { it.groupValues[1] to it.groupValues[2] } - - compilerPluginOptionsBySourceSet.entries.forEach { (sourceSetName, argsString) -> - val shouldHaveAndroidExtensionArgs = sourceSetName.startsWith("androidApp") && - (androidGradlePluginVersion < AGPVersion.v7_0_0 || !sourceSetName.contains("AndroidTestRelease")) && - (androidGradlePluginVersion < AGPVersion.v7_1_0 || !sourceSetName.contains("androidAppTestFixtures")) - - if (shouldHaveAndroidExtensionArgs) - assertTrue("$sourceSetName is an Android source set and should have Android Extensions in the args") { - "plugin:org.jetbrains.kotlin.android" in argsString - } - else - assertEquals( - "[]", - argsString, - "$sourceSetName is not an Android source set and should not have Android Extensions in the args" - ) - } } val groupDir = "lib/build/repo/com/example/" @@ -704,16 +682,6 @@ open class KotlinAndroid70GradleIT : KotlinAndroid36GradleIT() { } } - @Test - fun testNamespaceDSLInsteadOfPackageAttributeInManifest() { - val project = Project("AndroidExtensionsProjectAGP7") - val options = defaultBuildOptions().copy(incremental = false) - - project.build("assembleDebug", options = options) { - assertSuccessful() - assertContains("The 'kotlin-android-extensions' Gradle plugin is deprecated") - } - } } open class KotlinAndroid71GradleIT : KotlinAndroid70GradleIT() { @@ -1024,42 +992,6 @@ abstract class AbstractKotlinAndroidGradleTests : BaseGradleIT() { } } - // KT-51177: when experimental flag is enabled - @Test - fun testIncrementalBuildAfterResourceChangeAndroidExtensions() { - val project = Project("AndroidExtensionsProject") - project.setupWorkingDir() - - project.projectDir.resolve("app/build.gradle").appendText( - """ - | - |androidExtensions { - | experimental = true - |} - | - """.trimMargin() - ) - - project.build("assembleDebug") { - assertSuccessful() - assertTasksExecuted(":app:compileDebugKotlin") - } - - project.projectDir - .resolve("app/src/main/res/layout/activity_main.xml") - .modify { - it.replace("android:layout_width=\"wrap_content\"", "android:layout_width=\"match_parent\"") - } - - project.build("assembleDebug") { - assertSuccessful() - assertTasksExecuted(":app:compileDebugKotlin") - assertContainsRegex( - "compilerMode=INCREMENTAL_COMPILER.*areFileChangesKnown=true.*app/build/kotlin".toRegex() - ) - } - } - @Test fun testAndroidDaggerIC() { val project = Project("AndroidDaggerProject") @@ -1108,17 +1040,6 @@ abstract class AbstractKotlinAndroidGradleTests : BaseGradleIT() { } } - @Test - fun testAndroidExtensions() { - val project = Project("AndroidExtensionsProject") - val options = defaultBuildOptions().copy(incremental = false) - - project.build("assembleDebug", options = options) { - assertSuccessful() - assertContains("The 'kotlin-android-extensions' Gradle plugin is deprecated") - } - } - @Test fun testParcelize() { val project = Project("AndroidParcelizeProject") @@ -1129,65 +1050,6 @@ abstract class AbstractKotlinAndroidGradleTests : BaseGradleIT() { } } - @Test - fun testAndroidExtensionsIncremental() { - val project = Project("AndroidExtensionsProject") - val options = defaultBuildOptions().copy(incremental = true, useClasspathSnapshot = true) - - project.build("assembleDebug", options = options) { - assertSuccessful() - val affectedSources = project.projectDir.getFilesByNames( - "MyActivity.kt", "noLayoutUsages.kt" - ) - val relativePaths = project.relativize(affectedSources) - assertCompiledKotlinSources(relativePaths) - } - - val activityLayout = File(project.projectDir, "app/src/main/res/layout/activity_main.xml") - activityLayout.modify { it.replace("textView", "newTextView") } - - project.build("assembleDebug", options = options) { - assertFailed() - val affectedSources = project.projectDir.getFilesByNames("MyActivity.kt") - val relativePaths = project.relativize(affectedSources) - assertCompiledKotlinSources(relativePaths) - } - } - - @Test - fun testAndroidExtensionsManyVariants() { - val project = Project("AndroidExtensionsManyVariants") - val options = defaultBuildOptions().copy(incremental = false) - - project.build("assemble", options = options) { - assertSuccessful() - } - } - - @Test - fun testAndroidExtensionsSpecificFeatures() { - val project = Project("AndroidExtensionsSpecificFeatures") - val options = defaultBuildOptions().copy(incremental = false) - - project.build("assemble", options = options) { - assertFailed() - assertContains("Unresolved reference: textView") - } - - File(project.projectDir, "app/build.gradle").modify { it.replace("[\"parcelize\"]", "[\"views\"]") } - - project.build("assemble", options = options) { - assertFailed() - assertContainsRegex("Class 'User' is not abstract and does not implement abstract member public abstract fun (writeToParcel|describeContents)".toRegex()) - } - - File(project.projectDir, "app/build.gradle").modify { it.replace("[\"views\"]", "[\"parcelize\", \"views\"]") } - - project.build("assemble", options = options) { - assertSuccessful() - } - } - @Test fun shouldAllowToApplyPluginWhenAndroidPluginIsMissing() { with(Project("simpleProject", minLogLevel = LogLevel.WARN)) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt index 0e3ec7ddf5a..c3d23d6f08b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt @@ -208,46 +208,6 @@ class BuildCacheRelocationIT : KGPBaseTest() { ) } - @AndroidGradlePluginTests - @DisplayName("KT-48849: Kotlin compile should ignore empty layout resource directories added by kotlin android extensions") - @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8) - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42) - @GradleAndroidTest - fun compileIgnoreEmptyAndroidResLayoutDirs( - gradleVersion: GradleVersion, - agpVersion: String, - jdkProvider: JdkVersions.ProvidedJdk - ) { - val (firstProject, secondProject) = prepareTestProjects( - "AndroidExtensionsProject", - gradleVersion, - defaultBuildOptions.copy(androidVersion = agpVersion), - jdkProvider.location - ) { - it.subProject("app").buildGradle.append( - """ - | - |androidExtensions { - | experimental = true - |} - """.trimMargin() - ) - } - - firstProject - .subProject("app") - .projectPath - .resolve("src/main/res/layout-ar") - .createDirectory() - - checkBuildCacheRelocation( - firstProject, - secondProject, - listOf("assembleDebug"), - listOf(":app:compileDebugKotlin") - ) - } - @NativeGradlePluginTests @DisplayName("with native project") @GradleTest diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/app/build.gradle index 45886df0053..10602cbfd53 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/app/build.gradle @@ -14,7 +14,7 @@ buildscript { apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' -apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-parcelize' android { compileSdkVersion 23 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/app/src/main/java/com/example/dagger/kotlin/ui/HomeActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/app/src/main/java/com/example/dagger/kotlin/ui/HomeActivity.kt index 8f1bed9459a..f3bbf74f93f 100755 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/app/src/main/java/com/example/dagger/kotlin/ui/HomeActivity.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidDaggerProject/app/src/main/java/com/example/dagger/kotlin/ui/HomeActivity.kt @@ -20,11 +20,11 @@ import android.content.Intent import android.location.LocationManager import android.os.Bundle import android.os.Parcelable +import android.widget.TextView import com.example.dagger.kotlin.DemoActivity import com.example.dagger.kotlin.DemoApplication import com.example.dagger.kotlin.R -import kotlinx.android.parcel.Parcelize -import kotlinx.android.synthetic.main.activity_main.locationInfo +import kotlinx.parcelize.Parcelize import javax.inject.Inject class HomeActivity : DemoActivity() { @@ -37,7 +37,7 @@ class HomeActivity : DemoActivity() { (application as DemoApplication).component.inject(this) // TODO do something with the injected dependencies here! - locationInfo.text = "Injected LocationManager:\n$locationManager" + (findViewById(R.id.locationInfo) as TextView).text = "Injected LocationManager:\n$locationManager" } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/build.gradle deleted file mode 100644 index 8c07b30df59..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/build.gradle +++ /dev/null @@ -1,56 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion 23 - buildToolsVersion "25.0.2" - defaultConfig { - applicationId "org.example.manyvariants" - minSdkVersion 15 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - } - } - - // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer. - compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 - } - - flavorDimensions "color" - - productFlavors { - demo { - dimension "color" - applicationIdSuffix ".demo" - versionNameSuffix "-demo" - } - full { - dimension "color" - applicationIdSuffix ".full" - versionNameSuffix "-full" - } - } - - lintOptions { - checkReleaseBuilds false - abortOnError false - } -} - -androidExtensions { - experimental = true - features = ["views", "parcelize"] -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/debug/java/debug.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/debug/java/debug.kt deleted file mode 100644 index b0e6855ab3a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/debug/java/debug.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.example.manyvariants - -import android.app.Activity -import kotlinx.android.synthetic.debug.activity_debug.* -import kotlinx.android.synthetic.main.activity_main.* - -fun Activity.debug() { - viewMain - viewDebug -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/debug/res/layout/activity_debug.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/debug/res/layout/activity_debug.xml deleted file mode 100644 index bcac5c6d528..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/debug/res/layout/activity_debug.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/demo/java/demo.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/demo/java/demo.kt deleted file mode 100644 index a60cb42d525..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/demo/java/demo.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.example.manyvariants - -import android.app.Activity -import kotlinx.android.synthetic.demo.activity_demo.* -import kotlinx.android.synthetic.main.activity_main.* - -fun Activity.demo() { - viewMain - viewDemo -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/demo/res/layout/activity_demo.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/demo/res/layout/activity_demo.xml deleted file mode 100644 index e385430bc36..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/demo/res/layout/activity_demo.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/demoDebug/java/demoDebug.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/demoDebug/java/demoDebug.kt deleted file mode 100644 index 1d075e7fb96..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/demoDebug/java/demoDebug.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.example.manyvariants - -import android.app.Activity -import kotlinx.android.synthetic.debug.activity_debug.* -import kotlinx.android.synthetic.demo.activity_demo.* -import kotlinx.android.synthetic.demoDebug.activity_demo_debug.* -import kotlinx.android.synthetic.main.activity_main.* - -fun Activity.demoDebug() { - viewMain - viewDemo - viewDebug - viewDemoDebug -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/demoDebug/res/layout/activity_demo_debug.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/demoDebug/res/layout/activity_demo_debug.xml deleted file mode 100644 index 4de6c56b593..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/demoDebug/res/layout/activity_demo_debug.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/full/java/full.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/full/java/full.kt deleted file mode 100644 index a3417c79745..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/full/java/full.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.example.manyvariants - -import android.app.Activity -import kotlinx.android.synthetic.full.activity_full.* -import kotlinx.android.synthetic.main.activity_main.* - -fun Activity.full() { - viewMain - viewFull -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/full/res/layout/activity_full.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/full/res/layout/activity_full.xml deleted file mode 100644 index ecb3053087d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/full/res/layout/activity_full.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/fullRelease/java/fullRelease.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/fullRelease/java/fullRelease.kt deleted file mode 100644 index 09bf11d1f7d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/fullRelease/java/fullRelease.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.example.manyvariants - -import android.app.Activity -import kotlinx.android.synthetic.full.activity_full.* -import kotlinx.android.synthetic.fullRelease.activity_full_release.* -import kotlinx.android.synthetic.main.activity_main.* -import kotlinx.android.synthetic.release.activity_release.* - -fun Activity.fullRelease() { - viewMain - viewFull - viewRelease - viewFullRelease -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/fullRelease/res/layout/activity_full_release.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/fullRelease/res/layout/activity_full_release.xml deleted file mode 100644 index c00bad64db4..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/fullRelease/res/layout/activity_full_release.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/main/AndroidManifest.xml deleted file mode 100644 index e9c317347f1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/main/java/MainActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/main/java/MainActivity.kt deleted file mode 100644 index 51624fea09f..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/main/java/MainActivity.kt +++ /dev/null @@ -1,18 +0,0 @@ -package org.example.manyvariants - -import android.app.Activity -import android.os.Bundle -import kotlinx.android.synthetic.main.activity_main.* -import kotlinx.android.parcel.Parcelize -import android.os.Parcelable - -class MainActivity : Activity() { - override fun onCreate(savedInstanceState: Bundle) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - viewMain - } -} - -@Parcelize -class User(val firstName: String, val lastName: String) : Parcelable \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/main/res/layout/activity_main.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 9174f1b66f5..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/release/java/release.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/release/java/release.kt deleted file mode 100644 index 890a9015f42..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/release/java/release.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.example.manyvariants - -import android.app.Activity -import kotlinx.android.synthetic.release.activity_release.* -import kotlinx.android.synthetic.main.activity_main.* - -fun Activity.release() { - viewMain - viewRelease -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/release/res/layout/activity_release.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/release/res/layout/activity_release.xml deleted file mode 100644 index 5e331cc6ee2..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/app/src/release/res/layout/activity_release.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/build.gradle deleted file mode 100644 index b25e675884f..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -buildscript { - repositories { - mavenLocal() - maven { url 'https://maven.google.com' } - mavenCentral() - maven { url = uri("https://jcenter.bintray.com/") } - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.android.tools.build:gradle:$android_tools_version" - } -} - -allprojects { - repositories { - mavenLocal() - maven { url 'https://maven.google.com' } - mavenCentral() - maven { url = uri("https://jcenter.bintray.com/") } - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/settings.gradle deleted file mode 100644 index e7b4def49cb..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsManyVariants/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/build.gradle deleted file mode 100644 index 38882db8444..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion 23 - buildToolsVersion "25.0.2" - - defaultConfig { - applicationId "com.example.dagger.kotlin" - minSdkVersion 14 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" - } - - // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer. - compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 - } - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/AndroidManifest.xml deleted file mode 100644 index 5063f2b77f8..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/java/com/example/androidextensions/MyActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/java/com/example/androidextensions/MyActivity.kt deleted file mode 100644 index 0b8cb004d46..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/java/com/example/androidextensions/MyActivity.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.androidextensions - -import android.os.Bundle -import android.app.Activity -import kotlinx.android.synthetic.main.activity_main.textView - -class HomeActivity : Activity() { - override fun onCreate(savedInstanceState: Bundle?) { - myUtilFunction() - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - - this.textView.setText("Hello, world!") - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/java/com/example/androidextensions/noLayoutUsages.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/java/com/example/androidextensions/noLayoutUsages.kt deleted file mode 100644 index 7834a2ddc6d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/java/com/example/androidextensions/noLayoutUsages.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.example.androidextensions - -fun myUtilFunction() = "OK" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/res/layout/activity_main.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 02b0685b4a4..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/res/values/strings.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/res/values/strings.xml deleted file mode 100644 index 67b44b1a8cd..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - kotlin - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/build.gradle deleted file mode 100644 index 3e1ecc01cc3..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - mavenLocal() - maven { url 'https://maven.google.com' } - mavenCentral() - maven { url = uri("https://jcenter.bintray.com/") } - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.android.tools.build:gradle:$android_tools_version" - } -} - -allprojects { - repositories { - mavenLocal() - maven { url 'https://maven.google.com' } - mavenCentral() - maven { url = uri("https://jcenter.bintray.com/") } - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/gradle.properties deleted file mode 100644 index 59b261a6689..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -org.gradle.jvmargs=-XX:MaxPermSize=512m \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/settings.gradle deleted file mode 100644 index e7b4def49cb..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProject/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/build.gradle deleted file mode 100644 index 46e22f12b3d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion 23 - buildToolsVersion "25.0.2" - namespace "com.example.androidextensions" - - defaultConfig { - applicationId "com.example.dagger.kotlin" - minSdkVersion 14 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" - } - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/AndroidManifest.xml deleted file mode 100644 index c3f5a36e644..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/java/com/example/androidextensions/MyActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/java/com/example/androidextensions/MyActivity.kt deleted file mode 100644 index 0b8cb004d46..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/java/com/example/androidextensions/MyActivity.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.androidextensions - -import android.os.Bundle -import android.app.Activity -import kotlinx.android.synthetic.main.activity_main.textView - -class HomeActivity : Activity() { - override fun onCreate(savedInstanceState: Bundle?) { - myUtilFunction() - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - - this.textView.setText("Hello, world!") - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/java/com/example/androidextensions/noLayoutUsages.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/java/com/example/androidextensions/noLayoutUsages.kt deleted file mode 100644 index 7834a2ddc6d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/java/com/example/androidextensions/noLayoutUsages.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.example.androidextensions - -fun myUtilFunction() = "OK" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/res/layout/activity_main.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 02b0685b4a4..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/res/values/strings.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/res/values/strings.xml deleted file mode 100644 index 67b44b1a8cd..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - kotlin - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/build.gradle deleted file mode 100644 index 3e1ecc01cc3..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - mavenLocal() - maven { url 'https://maven.google.com' } - mavenCentral() - maven { url = uri("https://jcenter.bintray.com/") } - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.android.tools.build:gradle:$android_tools_version" - } -} - -allprojects { - repositories { - mavenLocal() - maven { url 'https://maven.google.com' } - mavenCentral() - maven { url = uri("https://jcenter.bintray.com/") } - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/gradle.properties deleted file mode 100644 index 59b261a6689..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -org.gradle.jvmargs=-XX:MaxPermSize=512m \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/settings.gradle deleted file mode 100644 index e7b4def49cb..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsProjectAGP7/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/build.gradle deleted file mode 100644 index ae5f7fd1001..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/build.gradle +++ /dev/null @@ -1,40 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion 23 - buildToolsVersion "25.0.2" - - defaultConfig { - applicationId "com.example.dagger.kotlin" - minSdkVersion 14 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" - } - - // Needed for older AGP. It can be removed when the lowest supported AGP version is 4.2.0 or newer. - compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 - } - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - lintOptions { - checkReleaseBuilds false - abortOnError false - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} - -androidExtensions { - experimental = true - features = ["parcelize"] -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/src/main/AndroidManifest.xml deleted file mode 100644 index 5063f2b77f8..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/src/main/java/com/example/androidextensions/MyActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/src/main/java/com/example/androidextensions/MyActivity.kt deleted file mode 100644 index f86369c601d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/src/main/java/com/example/androidextensions/MyActivity.kt +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.androidextensions - -import android.os.Bundle -import android.app.Activity -import kotlinx.android.synthetic.main.activity_main.textView -import kotlinx.android.parcel.Parcelize -import android.os.Parcelable - -class HomeActivity : Activity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - - this.textView.setText("Hello, world!") - } -} - -@Parcelize -class User(val firstName: String, val lastName: String) : Parcelable \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/src/main/res/layout/activity_main.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 02b0685b4a4..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/src/main/res/values/strings.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/src/main/res/values/strings.xml deleted file mode 100644 index 67b44b1a8cd..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - kotlin - diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/build.gradle deleted file mode 100644 index 3e1ecc01cc3..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - mavenLocal() - maven { url 'https://maven.google.com' } - mavenCentral() - maven { url = uri("https://jcenter.bintray.com/") } - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.android.tools.build:gradle:$android_tools_version" - } -} - -allprojects { - repositories { - mavenLocal() - maven { url 'https://maven.google.com' } - mavenCentral() - maven { url = uri("https://jcenter.bintray.com/") } - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/gradle.properties deleted file mode 100644 index 59b261a6689..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -org.gradle.jvmargs=-XX:MaxPermSize=512m \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/settings.gradle deleted file mode 100644 index e7b4def49cb..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidExtensionsSpecificFeatures/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle index e6ff3d301fe..ed9cb1bee80 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalSingleModuleProject/app/build.gradle @@ -7,14 +7,12 @@ buildscript { } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" classpath 'com.android.tools.build:gradle:' + android_tools_version } } apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' android { compileSdkVersion 23 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/app/build.gradle index 4c780d31b10..c59304aca86 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidParcelizeProject/app/build.gradle @@ -32,5 +32,4 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-android-extensions-runtime:$kotlin_version" } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dagger/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dagger/app/build.gradle index 3e7a524127e..a2b6df11083 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dagger/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dagger/app/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' -apply plugin: 'kotlin-android-extensions' android { compileSdkVersion 23 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dagger/app/src/main/java/com/example/dagger/kotlin/ui/HomeActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dagger/app/src/main/java/com/example/dagger/kotlin/ui/HomeActivity.kt index 0991c03e1e7..0f772a2f302 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dagger/app/src/main/java/com/example/dagger/kotlin/ui/HomeActivity.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dagger/app/src/main/java/com/example/dagger/kotlin/ui/HomeActivity.kt @@ -17,10 +17,10 @@ package com.example.dagger.kotlin.ui import android.location.LocationManager import android.os.Bundle +import android.widget.TextView import com.example.dagger.kotlin.DemoActivity import com.example.dagger.kotlin.DemoApplication import com.example.dagger.kotlin.R -import kotlinx.android.synthetic.main.activity_main.locationInfo import javax.inject.Inject class HomeActivity : DemoActivity() { @@ -33,7 +33,7 @@ class HomeActivity : DemoActivity() { (application as DemoApplication).component.inject(this) // TODO do something with the injected dependencies here! - locationInfo.text = "Injected LocationManager:\n$locationManager" + (findViewById(R.id.locationInfo) as TextView).text = "Injected LocationManager:\n$locationManager" } inner class InnerClass diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding/library/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding/library/build.gradle index 1ecd9d9c3c0..55c65403e68 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding/library/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding/library/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' -apply plugin: 'kotlin-android-extensions' android { compileSdkVersion 27 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle index 7da40180c1a..e13bfe4eb81 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/java/mobi/porquenao/poc/kotlin/ui/BaseActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/java/mobi/porquenao/poc/kotlin/ui/BaseActivity.kt index f918193c35d..66ea3c60d29 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/java/mobi/porquenao/poc/kotlin/ui/BaseActivity.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/java/mobi/porquenao/poc/kotlin/ui/BaseActivity.kt @@ -5,7 +5,7 @@ import android.graphics.BitmapFactory import android.os.Build import android.os.Bundle import android.support.v7.app.AppCompatActivity -import kotlinx.android.synthetic.main.activity_main.* +import android.support.v7.widget.Toolbar import mobi.porquenao.poc.kotlin.R abstract class BaseActivity : AppCompatActivity() { @@ -17,7 +17,7 @@ abstract class BaseActivity : AppCompatActivity() { override fun setContentView(layoutResID: Int) { super.setContentView(layoutResID) - setSupportActionBar(toolbar) + setSupportActionBar(findViewById(R.id.toolbar) as Toolbar) } private fun prepareTaskDescription() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/java/mobi/porquenao/poc/kotlin/ui/MainActivity.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/java/mobi/porquenao/poc/kotlin/ui/MainActivity.kt index ca778d11e5e..3d42e9fc19b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/java/mobi/porquenao/poc/kotlin/ui/MainActivity.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/java/mobi/porquenao/poc/kotlin/ui/MainActivity.kt @@ -2,9 +2,9 @@ package mobi.porquenao.poc.kotlin.ui import android.os.Bundle import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView import android.view.Menu import android.view.MenuItem -import kotlinx.android.synthetic.main.activity_main.* import mobi.porquenao.poc.kotlin.R class MainActivity : BaseActivity() { @@ -14,7 +14,7 @@ class MainActivity : BaseActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - with (list) { + with (findViewById(R.id.list) as RecyclerView) { setHasFixedSize(true) layoutManager = LinearLayoutManager(this@MainActivity) listAdapter = MainAdapter() @@ -29,7 +29,7 @@ class MainActivity : BaseActivity() { override fun onOptionsItemSelected(item: MenuItem?): Boolean { listAdapter.add() - list.smoothScrollToPosition(0) + (findViewById(R.id.list) as RecyclerView).smoothScrollToPosition(0) return true } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/java/mobi/porquenao/poc/kotlin/ui/MainAdapter.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/java/mobi/porquenao/poc/kotlin/ui/MainAdapter.kt index aaf979ab140..089b8e53d61 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/java/mobi/porquenao/poc/kotlin/ui/MainAdapter.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/src/main/java/mobi/porquenao/poc/kotlin/ui/MainAdapter.kt @@ -1,12 +1,14 @@ package mobi.porquenao.poc.kotlin.ui import android.graphics.Color +import android.support.v7.widget.CardView import android.support.v7.widget.RecyclerView import android.text.format.DateFormat import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import kotlinx.android.synthetic.main.main_item.view.* +import android.widget.TextView +import android.widget.LinearLayout import mobi.porquenao.poc.kotlin.R import mobi.porquenao.poc.kotlin.core.Item import mobi.porquenao.poc.kotlin.core.ItemRepository @@ -59,9 +61,9 @@ class MainAdapter : RecyclerView.Adapter() { } class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { - val card = view.card - val container = view.container - val title = view.title - val date = view.date + val card = view.findViewById(R.id.card) as CardView + val container = view.findViewById(R.id.container) as LinearLayout + val title = view.findViewById(R.id.title) as TextView + val date = view.findViewById(R.id.date) as TextView } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle index 40f614d992d..e743554f121 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle @@ -19,7 +19,6 @@ buildscript { apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' -apply plugin: 'kotlin-android-extensions' apply plugin: 'realm-android' android { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/androidx-navigation-safe-args/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/androidx-navigation-safe-args/build.gradle index 5c326d95420..2c1c2e2ef16 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/androidx-navigation-safe-args/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/androidx-navigation-safe-args/build.gradle @@ -14,7 +14,6 @@ buildscript { apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' -apply plugin: 'kotlin-android-extensions' apply plugin: 'androidx.navigation.safeargs' android { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/androidx-navigation-safe-args/src/main/java/test/androidx/navigation/StartFragment.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/androidx-navigation-safe-args/src/main/java/test/androidx/navigation/StartFragment.kt index 357134f964b..38001751b4d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/androidx-navigation-safe-args/src/main/java/test/androidx/navigation/StartFragment.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/androidx-navigation-safe-args/src/main/java/test/androidx/navigation/StartFragment.kt @@ -7,10 +7,9 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Button import androidx.navigation.findNavController import androidx.navigation.fragment.findNavController -import kotlinx.android.synthetic.main.fragment_start.* -import kotlinx.android.synthetic.main.fragment_start.view.* // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -47,11 +46,11 @@ class StartFragment : Fragment() { val inf = inflater.inflate(R.layout.fragment_start,container,false) - inf.button.setOnClickListener { + (inf.findViewById(R.id.button) as Button).setOnClickListener { it.findNavController().navigate(StartFragmentDirections.actionStartFragmentToDestinationFragment1()) } - inf.button2.setOnClickListener { + (inf.findViewById(R.id.button2) as Button).setOnClickListener { it.findNavController().navigate(StartFragmentDirections.actionStartFragmentToDestinationFragment2()) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle index 9fd623d252a..7a956ced5c8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-multiplatform' -apply plugin: 'kotlin-android-extensions' group 'com.example' version '1.0'