summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Ruiz <alruiz@google.com>2015-07-24 09:17:11 -0700
committerAlex Ruiz <alruiz@google.com>2015-07-24 09:17:11 -0700
commit673594b3b42b6630dac53fe2b853daf53da11325 (patch)
tree07bbda68e306c8aab64871861c5d3f6d42cab4e4
parentac23ee0a510ae85452489d33339db5022099e89c (diff)
downloadtesting-673594b3b42b6630dac53fe2b853daf53da11325.tar.gz
Renamed AndroidFacet#isGradleProject to "requiresAndroidModel".
The actual rename happened here: https://android-review.googlesource.com/161400 Change-Id: I4542df0aeaf6cbf0a34e24c46902a4a51c8fed5c
-rw-r--r--src/com/google/gct/testing/CloudConfigurationProviderImpl.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/google/gct/testing/CloudConfigurationProviderImpl.java b/src/com/google/gct/testing/CloudConfigurationProviderImpl.java
index 02d57ed..a64f2d5 100644
--- a/src/com/google/gct/testing/CloudConfigurationProviderImpl.java
+++ b/src/com/google/gct/testing/CloudConfigurationProviderImpl.java
@@ -538,14 +538,14 @@ public class CloudConfigurationProviderImpl extends CloudConfigurationProvider {
return;
}
- IdeaAndroidProject ideaAndroidProject = runningState.getFacet().getIdeaAndroidProject();
- if (ideaAndroidProject == null) {
+ IdeaAndroidProject androidModel = runningState.getFacet().getAndroidModel();
+ if (androidModel == null) {
CloudTestingUtils.showErrorMessage(runningState.getFacet().getModule().getProject(), "Error uploading APKs",
"Your project is not an idea android project!\n");
return;
}
- AndroidArtifact mainArtifact = ideaAndroidProject.getSelectedVariant().getMainArtifact();
+ AndroidArtifact mainArtifact = androidModel.getSelectedVariant().getMainArtifact();
List<AndroidArtifactOutput> mainOutputs = Lists.newArrayList(mainArtifact.getOutputs());
if (mainOutputs.isEmpty()) {
CloudTestingUtils.showErrorMessage(runningState.getFacet().getModule().getProject(), "Error finding app APK",
@@ -554,7 +554,7 @@ public class CloudConfigurationProviderImpl extends CloudConfigurationProvider {
}
File appApk = mainOutputs.get(0).getMainOutputFile().getOutputFile();
- BaseArtifact testArtifactInfo = ideaAndroidProject.findSelectedTestArtifactInSelectedVariant();
+ BaseArtifact testArtifactInfo = androidModel.findSelectedTestArtifactInSelectedVariant();
if (!(testArtifactInfo instanceof AndroidArtifact)) {
CloudTestingUtils.showErrorMessage(runningState.getFacet().getModule().getProject(), "Error uploading APKs",
"Your test artifact is not an android artifact!\n");