diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt index e547835a996..fcd49dfa00a 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt @@ -63,12 +63,6 @@ abstract class AndroidPackageFragmentProviderExtension : PackageFragmentProvider createPackageFragment(packageFqName, false) createPackageFragment(packageFqName + ".view", true) - - if (variantData.variant.isMainVariant && !moduleData.any { it.variant.name == layoutName }) { - val deprecatedPackageFqName = AndroidConst.SYNTHETIC_PACKAGE + '.' + layoutName - createPackageFragment(deprecatedPackageFqName, false, isDeprecated = true) - createPackageFragment(deprecatedPackageFqName + ".view", true, isDeprecated = true) - } } } diff --git a/plugins/android-compiler-plugin/testData/descriptors/escapedLayoutName/result.txt b/plugins/android-compiler-plugin/testData/descriptors/escapedLayoutName/result.txt index bf0414c19c6..b78c1cda39a 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/escapedLayoutName/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/escapedLayoutName/result.txt @@ -10,26 +10,6 @@ kotlinx.android.synthetic public fun android.app.Fragment.clearFindViewByIdCache(): kotlin.Unit -kotlinx.android.synthetic.get - - public val android.app.Activity.item_detail_container: android.widget.FrameLayout! - public val android.app.Fragment.item_detail_container: android.widget.FrameLayout! - public val android.app.Activity.login: android.widget.Button! - public val android.app.Fragment.login: android.widget.Button! - public val android.app.Activity.password: android.widget.EditText! - public val android.app.Fragment.password: android.widget.EditText! - public val android.app.Activity.textView1: android.widget.TextView! - public val android.app.Fragment.textView1: android.widget.TextView! - - -kotlinx.android.synthetic.get.view - - public val android.view.View.item_detail_container: android.widget.FrameLayout! - public val android.view.View.login: android.widget.Button! - public val android.view.View.password: android.widget.EditText! - public val android.view.View.textView1: android.widget.TextView! - - kotlinx.android.synthetic.main diff --git a/plugins/android-compiler-plugin/testData/descriptors/fqNameInAttr/result.txt b/plugins/android-compiler-plugin/testData/descriptors/fqNameInAttr/result.txt index a71fcb26a47..bda91c1ffba 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/fqNameInAttr/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/fqNameInAttr/result.txt @@ -21,15 +21,4 @@ kotlinx.android.synthetic.main.test kotlinx.android.synthetic.main.test.view - public val android.view.View.MyKeyboardView: android.inputmethodservice.KeyboardView! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.MyKeyboardView: android.inputmethodservice.KeyboardView! - public val android.app.Fragment.MyKeyboardView: android.inputmethodservice.KeyboardView! - - -kotlinx.android.synthetic.test.view - public val android.view.View.MyKeyboardView: android.inputmethodservice.KeyboardView! \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/descriptors/fqNameInTag/result.txt b/plugins/android-compiler-plugin/testData/descriptors/fqNameInTag/result.txt index a71fcb26a47..bda91c1ffba 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/fqNameInTag/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/fqNameInTag/result.txt @@ -21,15 +21,4 @@ kotlinx.android.synthetic.main.test kotlinx.android.synthetic.main.test.view - public val android.view.View.MyKeyboardView: android.inputmethodservice.KeyboardView! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.MyKeyboardView: android.inputmethodservice.KeyboardView! - public val android.app.Fragment.MyKeyboardView: android.inputmethodservice.KeyboardView! - - -kotlinx.android.synthetic.test.view - public val android.view.View.MyKeyboardView: android.inputmethodservice.KeyboardView! \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/descriptors/layoutVariants/result.txt b/plugins/android-compiler-plugin/testData/descriptors/layoutVariants/result.txt index 3f8df43f531..f0eb0c754d2 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/layoutVariants/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/layoutVariants/result.txt @@ -21,15 +21,4 @@ kotlinx.android.synthetic.main.test kotlinx.android.synthetic.main.test.view - public val android.view.View.button: android.view.View! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.button: android.view.View! - public val android.app.Fragment.button: android.view.View! - - -kotlinx.android.synthetic.test.view - public val android.view.View.button: android.view.View! \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/descriptors/multiFile/result.txt b/plugins/android-compiler-plugin/testData/descriptors/multiFile/result.txt index e9ca0b4b657..5e3f7b4fda0 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/multiFile/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/multiFile/result.txt @@ -47,46 +47,6 @@ kotlinx.android.synthetic.main.test1 kotlinx.android.synthetic.main.test1.view - public val android.view.View.frameLayout: android.widget.FrameLayout! - public val android.view.View.loginButton: android.widget.Button! - public val android.view.View.passwordCaption: android.widget.EditText! - public val android.view.View.passwordField: android.widget.TextView! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.item_detail_container: android.widget.FrameLayout! - public val android.app.Fragment.item_detail_container: android.widget.FrameLayout! - public val android.app.Activity.login: android.widget.Button! - public val android.app.Fragment.login: android.widget.Button! - public val android.app.Activity.password: android.widget.EditText! - public val android.app.Fragment.password: android.widget.EditText! - public val android.app.Activity.textView1: android.widget.TextView! - public val android.app.Fragment.textView1: android.widget.TextView! - - -kotlinx.android.synthetic.test.view - - public val android.view.View.item_detail_container: android.widget.FrameLayout! - public val android.view.View.login: android.widget.Button! - public val android.view.View.password: android.widget.EditText! - public val android.view.View.textView1: android.widget.TextView! - - -kotlinx.android.synthetic.test1 - - public val android.app.Activity.frameLayout: android.widget.FrameLayout! - public val android.app.Fragment.frameLayout: android.widget.FrameLayout! - public val android.app.Activity.loginButton: android.widget.Button! - public val android.app.Fragment.loginButton: android.widget.Button! - public val android.app.Activity.passwordCaption: android.widget.EditText! - public val android.app.Fragment.passwordCaption: android.widget.EditText! - public val android.app.Activity.passwordField: android.widget.TextView! - public val android.app.Fragment.passwordField: android.widget.TextView! - - -kotlinx.android.synthetic.test1.view - public val android.view.View.frameLayout: android.widget.FrameLayout! public val android.view.View.loginButton: android.widget.Button! public val android.view.View.passwordCaption: android.widget.EditText! diff --git a/plugins/android-compiler-plugin/testData/descriptors/noIds/result.txt b/plugins/android-compiler-plugin/testData/descriptors/noIds/result.txt index 720e5dd5716..36c3c088217 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/noIds/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/noIds/result.txt @@ -16,10 +16,4 @@ kotlinx.android.synthetic.main kotlinx.android.synthetic.main.test -kotlinx.android.synthetic.main.test.view - - -kotlinx.android.synthetic.test - - -kotlinx.android.synthetic.test.view \ No newline at end of file +kotlinx.android.synthetic.main.test.view \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/descriptors/sameIds/result.txt b/plugins/android-compiler-plugin/testData/descriptors/sameIds/result.txt index 6cbdbabe1f5..f84c495153f 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/sameIds/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/sameIds/result.txt @@ -23,19 +23,5 @@ kotlinx.android.synthetic.main.test kotlinx.android.synthetic.main.test.view - public val android.view.View.textView1: android.view.View! - public val android.view.View.textView2: android.widget.TextView! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.textView1: android.view.View! - public val android.app.Fragment.textView1: android.view.View! - public val android.app.Activity.textView2: android.widget.TextView! - public val android.app.Fragment.textView2: android.widget.TextView! - - -kotlinx.android.synthetic.test.view - public val android.view.View.textView1: android.view.View! public val android.view.View.textView2: android.widget.TextView! \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/descriptors/severalResDirs/result.txt b/plugins/android-compiler-plugin/testData/descriptors/severalResDirs/result.txt index 1f7efd5686b..e0f440a86b1 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/severalResDirs/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/severalResDirs/result.txt @@ -25,23 +25,6 @@ kotlinx.android.synthetic.main.test kotlinx.android.synthetic.main.test.view - public val android.view.View.button: android.view.View! - public val android.view.View.button2: android.widget.Button! - public val android.view.View.button3: android.widget.Button! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.button: android.view.View! - public val android.app.Fragment.button: android.view.View! - public val android.app.Activity.button2: android.widget.Button! - public val android.app.Fragment.button2: android.widget.Button! - public val android.app.Activity.button3: android.widget.Button! - public val android.app.Fragment.button3: android.widget.Button! - - -kotlinx.android.synthetic.test.view - public val android.view.View.button: android.view.View! public val android.view.View.button2: android.widget.Button! public val android.view.View.button3: android.widget.Button! \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/descriptors/singleFile/result.txt b/plugins/android-compiler-plugin/testData/descriptors/singleFile/result.txt index 7c6feb66ad0..b0d1df65ef0 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/singleFile/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/singleFile/result.txt @@ -27,26 +27,6 @@ kotlinx.android.synthetic.main.test kotlinx.android.synthetic.main.test.view - public val android.view.View.item_detail_container: android.widget.FrameLayout! - public val android.view.View.login: android.widget.Button! - public val android.view.View.password: android.widget.EditText! - public val android.view.View.textView1: android.widget.TextView! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.item_detail_container: android.widget.FrameLayout! - public val android.app.Fragment.item_detail_container: android.widget.FrameLayout! - public val android.app.Activity.login: android.widget.Button! - public val android.app.Fragment.login: android.widget.Button! - public val android.app.Activity.password: android.widget.EditText! - public val android.app.Fragment.password: android.widget.EditText! - public val android.app.Activity.textView1: android.widget.TextView! - public val android.app.Fragment.textView1: android.widget.TextView! - - -kotlinx.android.synthetic.test.view - public val android.view.View.item_detail_container: android.widget.FrameLayout! public val android.view.View.login: android.widget.Button! public val android.view.View.password: android.widget.EditText! diff --git a/plugins/android-compiler-plugin/testData/descriptors/specialTags/result.txt b/plugins/android-compiler-plugin/testData/descriptors/specialTags/result.txt index 4e0d79e4d9f..f999e2608b8 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/specialTags/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/specialTags/result.txt @@ -27,25 +27,6 @@ kotlinx.android.synthetic.main.test kotlinx.android.synthetic.main.test.view - public val android.view.View.`fun`: android.widget.TextView! - public val android.view.View.includeTag: android.view.View! - public val android.view.View.set: android.widget.Button! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.fragmentTag: android.app.Fragment! - public val android.app.Fragment.fragmentTag: android.app.Fragment! - public val android.app.Activity.`fun`: android.widget.TextView! - public val android.app.Fragment.`fun`: android.widget.TextView! - public val android.app.Activity.includeTag: android.view.View! - public val android.app.Fragment.includeTag: android.view.View! - public val android.app.Activity.set: android.widget.Button! - public val android.app.Fragment.set: android.widget.Button! - - -kotlinx.android.synthetic.test.view - public val android.view.View.`fun`: android.widget.TextView! public val android.view.View.includeTag: android.view.View! public val android.view.View.set: android.widget.Button! \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/descriptors/supportSingleFile/result.txt b/plugins/android-compiler-plugin/testData/descriptors/supportSingleFile/result.txt index 7c6feb66ad0..b0d1df65ef0 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/supportSingleFile/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/supportSingleFile/result.txt @@ -27,26 +27,6 @@ kotlinx.android.synthetic.main.test kotlinx.android.synthetic.main.test.view - public val android.view.View.item_detail_container: android.widget.FrameLayout! - public val android.view.View.login: android.widget.Button! - public val android.view.View.password: android.widget.EditText! - public val android.view.View.textView1: android.widget.TextView! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.item_detail_container: android.widget.FrameLayout! - public val android.app.Fragment.item_detail_container: android.widget.FrameLayout! - public val android.app.Activity.login: android.widget.Button! - public val android.app.Fragment.login: android.widget.Button! - public val android.app.Activity.password: android.widget.EditText! - public val android.app.Fragment.password: android.widget.EditText! - public val android.app.Activity.textView1: android.widget.TextView! - public val android.app.Fragment.textView1: android.widget.TextView! - - -kotlinx.android.synthetic.test.view - public val android.view.View.item_detail_container: android.widget.FrameLayout! public val android.view.View.login: android.widget.Button! public val android.view.View.password: android.widget.EditText! diff --git a/plugins/android-compiler-plugin/testData/descriptors/supportSpecialTags/result.txt b/plugins/android-compiler-plugin/testData/descriptors/supportSpecialTags/result.txt index 4e0d79e4d9f..f999e2608b8 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/supportSpecialTags/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/supportSpecialTags/result.txt @@ -27,25 +27,6 @@ kotlinx.android.synthetic.main.test kotlinx.android.synthetic.main.test.view - public val android.view.View.`fun`: android.widget.TextView! - public val android.view.View.includeTag: android.view.View! - public val android.view.View.set: android.widget.Button! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.fragmentTag: android.app.Fragment! - public val android.app.Fragment.fragmentTag: android.app.Fragment! - public val android.app.Activity.`fun`: android.widget.TextView! - public val android.app.Fragment.`fun`: android.widget.TextView! - public val android.app.Activity.includeTag: android.view.View! - public val android.app.Fragment.includeTag: android.view.View! - public val android.app.Activity.set: android.widget.Button! - public val android.app.Fragment.set: android.widget.Button! - - -kotlinx.android.synthetic.test.view - public val android.view.View.`fun`: android.widget.TextView! public val android.view.View.includeTag: android.view.View! public val android.view.View.set: android.widget.Button! \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/descriptors/unresolvedFqName/result.txt b/plugins/android-compiler-plugin/testData/descriptors/unresolvedFqName/result.txt index e884bfc85a8..8ba3bbedc94 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/unresolvedFqName/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/unresolvedFqName/result.txt @@ -21,15 +21,4 @@ kotlinx.android.synthetic.main.test kotlinx.android.synthetic.main.test.view - public val android.view.View.MyView: android.view.View! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.MyView: android.view.View! - public val android.app.Fragment.MyView: android.view.View! - - -kotlinx.android.synthetic.test.view - public val android.view.View.MyView: android.view.View! \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/descriptors/unresolvedWidget/result.txt b/plugins/android-compiler-plugin/testData/descriptors/unresolvedWidget/result.txt index 90f17094bf7..9ef862c7b20 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/unresolvedWidget/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/unresolvedWidget/result.txt @@ -21,15 +21,4 @@ kotlinx.android.synthetic.main.test kotlinx.android.synthetic.main.test.view - public val android.view.View.MyKeyboardView: android.view.View! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.MyKeyboardView: android.view.View! - public val android.app.Fragment.MyKeyboardView: android.view.View! - - -kotlinx.android.synthetic.test.view - public val android.view.View.MyKeyboardView: android.view.View! \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/descriptors/viewStub/result.txt b/plugins/android-compiler-plugin/testData/descriptors/viewStub/result.txt index 6ea70ff0386..c4f583276cd 100644 --- a/plugins/android-compiler-plugin/testData/descriptors/viewStub/result.txt +++ b/plugins/android-compiler-plugin/testData/descriptors/viewStub/result.txt @@ -21,15 +21,4 @@ kotlinx.android.synthetic.main.test kotlinx.android.synthetic.main.test.view - public val android.view.View.stub: android.view.View! - - -kotlinx.android.synthetic.test - - public val android.app.Activity.stub: android.view.View! - public val android.app.Fragment.stub: android.view.View! - - -kotlinx.android.synthetic.test.view - public val android.view.View.stub: android.view.View! \ No newline at end of file