From 3d8df88ab2155c29c44596950c5e0428e3236734 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 23 Oct 2015 15:19:31 +0300 Subject: [PATCH] Fix some misc tests (Android variants) --- compiler/testData/cli/jvm/pluginSimple.kt | 2 +- compiler/testData/cli/jvm/pluginSimpleUsage.kt | 2 +- .../android/simple/src/com/example/myapp/MyActivity.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/testData/cli/jvm/pluginSimple.kt b/compiler/testData/cli/jvm/pluginSimple.kt index 5b0491b0085..34573286b09 100644 --- a/compiler/testData/cli/jvm/pluginSimple.kt +++ b/compiler/testData/cli/jvm/pluginSimple.kt @@ -1,7 +1,7 @@ import android.view.* import android.app.* import android.widget.* -import kotlinx.android.synthetic.layout.* +import kotlinx.android.synthetic.main.layout.* class MyActivity : Activity() { init { textView.setText("Some text") } diff --git a/compiler/testData/cli/jvm/pluginSimpleUsage.kt b/compiler/testData/cli/jvm/pluginSimpleUsage.kt index ca0ce75a79a..ee72fbe10f6 100644 --- a/compiler/testData/cli/jvm/pluginSimpleUsage.kt +++ b/compiler/testData/cli/jvm/pluginSimpleUsage.kt @@ -1,7 +1,7 @@ import android.view.* import android.app.* import android.widget.* -import kotlinx.android.synthetic.layout.* +import kotlinx.android.synthetic.main.layout.* class MyActivity : Activity() { { textView.setText("Some text") } diff --git a/plugins/android-jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt b/plugins/android-jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt index 4a0822a993e..aabba6205e5 100644 --- a/plugins/android-jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt +++ b/plugins/android-jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt @@ -8,8 +8,8 @@ import android.view.ViewGroup import android.view.View import kotlinx.android.synthetic.main.* -import kotlinx.android.synthetic.fragment.* -import kotlinx.android.synthetic.fragment.view.* +import kotlinx.android.synthetic.main.fragment.* +import kotlinx.android.synthetic.main.fragment.view.* public class MyActivity : Activity() { override fun onCreate(savedInstanceState: Bundle?) {