|
43 | 43 | import org.gradle.api.artifacts.Configuration; |
44 | 44 | import org.gradle.api.tasks.compile.JavaCompile; |
45 | 45 | import org.gradle.api.tasks.testing.Test; |
46 | | -import org.jetbrains.kotlin.gradle.internal.AndroidExtensionsExtension; |
47 | 46 | import org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper; |
48 | 47 | import org.w3c.dom.Document; |
49 | 48 |
|
@@ -74,6 +73,7 @@ public abstract class AndroidTarget extends JvmTarget { |
74 | 73 | @Nullable private final String versionName; |
75 | 74 | @Nullable private final Integer versionCode; |
76 | 75 |
|
| 76 | + @SuppressWarnings("UnnecessarilyFullyQualified") |
77 | 77 | protected AndroidTarget(Project project, String name, boolean isTest) { |
78 | 78 | super(project, name); |
79 | 79 |
|
@@ -112,10 +112,10 @@ protected AndroidTarget(Project project, String name, boolean isTest) { |
112 | 112 |
|
113 | 113 | @Var boolean hasKotlinExtension; |
114 | 114 | try { |
115 | | - AndroidExtensionsExtension androidExtensions = |
116 | | - project.getExtensions().getByType(AndroidExtensionsExtension.class); |
| 115 | + org.jetbrains.kotlin.gradle.internal.AndroidExtensionsExtension androidExtensions = |
| 116 | + project.getExtensions().getByType(org.jetbrains.kotlin.gradle.internal.AndroidExtensionsExtension.class); |
117 | 117 | hasKotlinExtension = hasKotlinAndroidExtensions && androidExtensions.isExperimental(); |
118 | | - } catch (Exception ignored) { |
| 118 | + } catch (Throwable ignored) { |
119 | 119 | hasKotlinExtension = false; |
120 | 120 | } |
121 | 121 | hasExperimentalKotlinAndroidExtensions = hasKotlinExtension; |
|
0 commit comments