Cleanup in libraries

libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/RoundEnvironmentWrapper.kt

@@ -86,7 +86,7 @@ internal class RoundEnvironmentWrapper(
 
         if (kotlinAnnotationsProvider.supportInheritedAnnotations) {
             val isInherited = processingEnv.getElementUtils().getTypeElement(annotationFqName)
-                    ?.hasAnnotation(javaClass<Inherited>().getCanonicalName()) ?: false
+                    ?.hasAnnotation(Inherited::class.java.getCanonicalName()) ?: false
 
             if (isInherited) {
                 kotlinAnnotationsProvider.kotlinClasses.forEach { classFqName ->

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt

@@ -35,7 +35,7 @@ fun Project.initKapt(
         subpluginEnvironment: SubpluginEnvironment,
         taskFactory: (suffix: String) -> AbstractCompile
 ): AbstractCompile? {
-    val kaptExtension = extensions.getByType(javaClass<KaptExtension>())
+    val kaptExtension = extensions.getByType(KaptExtension::class.java)
     val kotlinAfterJavaTask: AbstractCompile?
 
     if (kaptExtension.generateStubs) {
@@ -193,7 +193,7 @@ public class AnnotationProcessingManager(
     }
 
     private fun appendAdditionalComplerArgs() {
-        val kaptExtension = project.extensions.getByType(javaClass<KaptExtension>())
+        val kaptExtension = project.extensions.getByType(KaptExtension::class.java)
         val args = kaptExtension.getAdditionalArguments(project, androidVariant, getAndroidExtension())
         if (args.isEmpty()) return
 

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt

@@ -218,7 +218,7 @@ class Kotlin2JsSourceSetProcessor(
 
     private fun createCleanSourceMapTask() {
         val taskName = sourceSet.getTaskName("clean", "sourceMap")
-        val task = project.getTasks().create(taskName, javaClass<Delete>())
+        val task = project.getTasks().create(taskName, Delete::class.java)
         task.onlyIf { kotlinTask.property("sourceMap") as Boolean }
         task.delete(object : Closure<String>(this) {
             override fun call(): String? = (kotlinTask.property("outputFile") as String) + ".map"
@@ -232,10 +232,10 @@ abstract class AbstractKotlinPlugin @Inject constructor(val scriptHandler: Scrip
     abstract fun buildSourceSetProcessor(project: ProjectInternal, javaBasePlugin: JavaBasePlugin, sourceSet: SourceSet): KotlinSourceSetProcessor<*>
 
     public override fun apply(project: Project) {
-        val javaBasePlugin = project.getPlugins().apply(javaClass<JavaBasePlugin>())
-        val javaPluginConvention = project.getConvention().getPlugin(javaClass<JavaPluginConvention>())
+        val javaBasePlugin = project.getPlugins().apply(JavaBasePlugin::class.java)
+        val javaPluginConvention = project.getConvention().getPlugin(JavaPluginConvention::class.java)
 
-        project.getPlugins().apply(javaClass<JavaPlugin>())
+        project.getPlugins().apply(JavaPlugin::class.java)
 
         configureSourceSetDefaults(project as ProjectInternal, javaBasePlugin, javaPluginConvention)
     }
@@ -456,7 +456,7 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
 private fun loadSubplugins(project: Project): SubpluginEnvironment {
     try {
         val subplugins = ServiceLoader.load(
-            javaClass<KotlinGradleSubplugin>(), project.getBuildscript().getClassLoader()).toList()
+                KotlinGradleSubplugin::class.java, project.getBuildscript().getClassLoader()).toList()
         val subpluginDependencyNames =
             subplugins.mapTo(hashSetOf<String>()) { it.getGroupName() + ":" + it.getArtifactName() }
 
@@ -556,13 +556,13 @@ private fun Project.createAptConfiguration(sourceSetName: String, kotlinAnnotati
 }
 
 private fun Project.createKaptExtension() {
-    getExtensions().create("kapt", javaClass<KaptExtension>())
+    getExtensions().create("kapt", KaptExtension::class.java)
 }
 
 //copied from BasePlugin.getLocalVersion
 private fun loadAndroidPluginVersion(): String? {
     try {
-        val clazz = javaClass<BasePlugin>()
+        val clazz = BasePlugin::class.java
         val className = clazz.getSimpleName() + ".class"
         val classPath = clazz.getResource(className).toString()
         if (!classPath.startsWith("jar")) {

libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt

@@ -126,7 +126,7 @@ abstract class BaseGradleIT {
         val tailParameters = params.asList() +
                 listOf( pathToKotlinPlugin,
                         if (options.withDaemon) "--daemon" else "--no-daemon",
-                        "--${minLogLevel.name().toLowerCase()}",
+                        "--${minLogLevel.name.toLowerCase()}",
                         "-Pkotlin.gradle.test=true")
 
         return createGradleCommand(tailParameters)

libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptArguments/src/main/java/test.kt

@@ -7,6 +7,6 @@ public class TestClass {
     public val testVal: String = "text"
 
     @example.ExampleAnnotation
-    public fun testFunction(): Class<*> = javaClass<TestClassCustomized>()
+    public fun testFunction(): Class<*> = TestClassCustomized::class.java
 
 }

libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kaptStubs/src/main/java/test.kt

@@ -7,6 +7,6 @@ public class TestClass {
     public val testVal: String = "text"
 
     @example.ExampleAnnotation
-    public fun testFunction(): Class<*> = javaClass<TestClassGenerated>()
+    public fun testFunction(): Class<*> = TestClassGenerated::class.java
 
 }