Android Extensions: Remove deprecated k.a.s.<layout> convention

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)
-                }
             }
         }
 

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
 
 

plugins/android-compiler-plugin/testData/descriptors/fqNameInAttr/result.txt

@@ -22,14 +22,3 @@ 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!

plugins/android-compiler-plugin/testData/descriptors/fqNameInTag/result.txt

@@ -22,14 +22,3 @@ 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!

plugins/android-compiler-plugin/testData/descriptors/layoutVariants/result.txt

@@ -22,14 +22,3 @@ 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!

plugins/android-compiler-plugin/testData/descriptors/multiFile/result.txt

@@ -51,43 +51,3 @@ kotlinx.android.synthetic.main.test1.view
     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!
-    public val android.view.View.passwordField: android.widget.TextView!

plugins/android-compiler-plugin/testData/descriptors/noIds/result.txt

@@ -17,9 +17,3 @@ kotlinx.android.synthetic.main.test
 
 
 kotlinx.android.synthetic.main.test.view
-
-
-kotlinx.android.synthetic.test
-
-
-kotlinx.android.synthetic.test.view

plugins/android-compiler-plugin/testData/descriptors/sameIds/result.txt

@@ -25,17 +25,3 @@ 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!

plugins/android-compiler-plugin/testData/descriptors/severalResDirs/result.txt

@@ -28,20 +28,3 @@ 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!

plugins/android-compiler-plugin/testData/descriptors/singleFile/result.txt

@@ -31,23 +31,3 @@ kotlinx.android.synthetic.main.test.view
     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!
-    public val android.view.View.textView1: android.widget.TextView!

plugins/android-compiler-plugin/testData/descriptors/specialTags/result.txt

@@ -30,22 +30,3 @@ 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!

plugins/android-compiler-plugin/testData/descriptors/supportSingleFile/result.txt

@@ -31,23 +31,3 @@ kotlinx.android.synthetic.main.test.view
     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!
-    public val android.view.View.textView1: android.widget.TextView!

plugins/android-compiler-plugin/testData/descriptors/supportSpecialTags/result.txt

@@ -30,22 +30,3 @@ 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!

plugins/android-compiler-plugin/testData/descriptors/unresolvedFqName/result.txt

@@ -22,14 +22,3 @@ 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!

plugins/android-compiler-plugin/testData/descriptors/unresolvedWidget/result.txt

@@ -22,14 +22,3 @@ 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!

plugins/android-compiler-plugin/testData/descriptors/viewStub/result.txt

@@ -22,14 +22,3 @@ 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!