Skip to content

Commit 8fbd54d

Browse files
authored
Update AndroidTarget due to changes in available types (#994)
1 parent 71db285 commit 8fbd54d

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

buildSrc/src/main/java/com/uber/okbuck/core/model/android/AndroidTarget.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.gradle.api.artifacts.Configuration;
4444
import org.gradle.api.tasks.compile.JavaCompile;
4545
import org.gradle.api.tasks.testing.Test;
46-
import org.jetbrains.kotlin.gradle.internal.AndroidExtensionsExtension;
4746
import org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper;
4847
import org.w3c.dom.Document;
4948

@@ -74,6 +73,7 @@ public abstract class AndroidTarget extends JvmTarget {
7473
@Nullable private final String versionName;
7574
@Nullable private final Integer versionCode;
7675

76+
@SuppressWarnings("UnnecessarilyFullyQualified")
7777
protected AndroidTarget(Project project, String name, boolean isTest) {
7878
super(project, name);
7979

@@ -112,10 +112,10 @@ protected AndroidTarget(Project project, String name, boolean isTest) {
112112

113113
@Var boolean hasKotlinExtension;
114114
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);
117117
hasKotlinExtension = hasKotlinAndroidExtensions && androidExtensions.isExperimental();
118-
} catch (Exception ignored) {
118+
} catch (Throwable ignored) {
119119
hasKotlinExtension = false;
120120
}
121121
hasExperimentalKotlinAndroidExtensions = hasKotlinExtension;

0 commit comments

Comments
 (0)