diff options
| author | Josiah Gaskin <josiahgaskin@google.com> | 2014-03-04 14:57:13 -0800 |
|---|---|---|
| committer | Josiah Gaskin <josiahgaskin@google.com> | 2014-03-05 11:07:12 -0800 |
| commit | 590d518d4ac915185f5ece8ea5ea919f52a3d4ac (patch) | |
| tree | 6dda8883a4bd6e74705c98ff33c0809d45221b81 /android/testData/projects | |
| parent | 8ef48e4ce855e7e9fe4b90f81fbc3fabf28e725f (diff) | |
| download | idea-590d518d4ac915185f5ece8ea5ea919f52a3d4ac.tar.gz | |
Support GetAllSrcSets on IdeaSourceProvider
This change renames the getSourceSets function recently added to
IdeaSourceProvider to getCurrentSourceSets to more accurately
reflect its behavior and introduces a new API getAll(Idea)SourceSets which
will return all source sets for the given facet.
It also updates ChooseOutputLocation step to use this new API instead
of manually searching through the source sets.
Change-Id: I0367932f1c52a640e8e83cf8e57c6c11e81eeab0
Diffstat (limited to 'android/testData/projects')
| -rw-r--r-- | android/testData/projects/projectWithAppandLib/gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | android/testData/projects/projectWithAppandLib/lib/build.gradle | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/android/testData/projects/projectWithAppandLib/gradle/wrapper/gradle-wrapper.properties b/android/testData/projects/projectWithAppandLib/gradle/wrapper/gradle-wrapper.properties index 5de946b072f..347fc24a850 100644 --- a/android/testData/projects/projectWithAppandLib/gradle/wrapper/gradle-wrapper.properties +++ b/android/testData/projects/projectWithAppandLib/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip diff --git a/android/testData/projects/projectWithAppandLib/lib/build.gradle b/android/testData/projects/projectWithAppandLib/lib/build.gradle index 08465eb914f..75db87c22bd 100644 --- a/android/testData/projects/projectWithAppandLib/lib/build.gradle +++ b/android/testData/projects/projectWithAppandLib/lib/build.gradle @@ -10,9 +10,11 @@ android { versionCode 1 versionName "1.0" } - release { + buildTypes { + release { runProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } } } |