From 62e42d6f45c155a6e6396d7594fd3700de3778e1 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 31 Jan 2017 19:06:15 +0300 Subject: [PATCH] Fix kapt1 with stubs test to main internal references --- .../jetbrains/kotlin/gradle/plugin/TaskToFriendTaskMapper.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/TaskToFriendTaskMapper.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/TaskToFriendTaskMapper.kt index 66b52e07b3b..e699b4d6b83 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/TaskToFriendTaskMapper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/TaskToFriendTaskMapper.kt @@ -35,10 +35,10 @@ sealed internal class RegexTaskToFriendTaskMapper( suffix: String, private val postfixReplacement: String ) : TaskToFriendTaskMapper() { - class Default : RegexTaskToFriendTaskMapper("compile", "TestKotlin", "Kotlin") + class Default : RegexTaskToFriendTaskMapper("compile", "TestKotlin(AfterJava)?", "Kotlin") class JavaScript : RegexTaskToFriendTaskMapper("compile", "TestKotlin2Js", "Kotlin2Js") class Common : RegexTaskToFriendTaskMapper("compile", "TestKotlinCommon", "KotlinCommon") - class Android : RegexTaskToFriendTaskMapper("compile", "(Unit|Android)TestKotlin", "Kotlin") + class Android : RegexTaskToFriendTaskMapper("compile", "(Unit|Android)TestKotlin(AfterJava)?", "Kotlin") private val regex = "$prefix(.*)$suffix".toRegex()