diff options
| author | Christian Williams <christianw@google.com> | 2016-11-16 16:26:19 -0800 |
|---|---|---|
| committer | Christian Williams <christianw@google.com> | 2016-11-30 13:31:23 -0800 |
| commit | bf9eace4c73ceda96f7227cf3d26477cdda824f6 (patch) | |
| tree | 901ee3a41291db4e147103b3bd780b66ef753834 /buildSrc | |
| parent | 0d02565c38bcc42084258435d86fc542a862329b (diff) | |
| download | robolectric-shadows-bf9eace4c73ceda96f7227cf3d26477cdda824f6.tar.gz | |
Continue to support JDK 7.
Use latest Android SDK supported by the current JDK for running tests.
Android SDK 24 no longer supports JDK 7, so continue to run tests with
SDK 23.
Diffstat (limited to 'buildSrc')
| -rw-r--r-- | buildSrc/src/main/groovy/AndroidSdk.groovy | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/buildSrc/src/main/groovy/AndroidSdk.groovy b/buildSrc/src/main/groovy/AndroidSdk.groovy index a48f9ea1c..36e65be06 100644 --- a/buildSrc/src/main/groovy/AndroidSdk.groovy +++ b/buildSrc/src/main/groovy/AndroidSdk.groovy @@ -14,13 +14,13 @@ class AndroidSdk implements Comparable<AndroidSdk> { JELLY_BEAN, JELLY_BEAN_MR1, JELLY_BEAN_MR2, KITKAT, LOLLIPOP, LOLLIPOP_MR1, M, N ] - static final SUPPORTED_SDKS = ALL_SDKS.findAll { it.isSupportedOnThisJdk() } - static final MAX_SUPPORTED_SDK = Collections.max(SUPPORTED_SDKS) + static final JDK_SUPPORTED_SDKS = ALL_SDKS.findAll { it.isSupportedOnThisJdk() } + static final MAX_SDK_FOR_THIS_JDK = Collections.max(JDK_SUPPORTED_SDKS) static final MAX_SDK = Collections.max(ALL_SDKS) static { - if (MAX_SUPPORTED_SDK != MAX_SDK) { - println "WARNING: Running with JDK $jdkVersion, max supported Android SDK is $MAX_SUPPORTED_SDK.apiLevel." + if (MAX_SDK_FOR_THIS_JDK != MAX_SDK) { + println "WARNING: Running with JDK $jdkVersion, max supported Android SDK is $MAX_SDK_FOR_THIS_JDK.apiLevel." } } @@ -30,10 +30,10 @@ class AndroidSdk implements Comparable<AndroidSdk> { private final String minJdkVersion AndroidSdk(int apiLevel, String androidVersion, int frameworkSdkBuildVersion, String minJdkVersion) { - this.minJdkVersion = minJdkVersion - this.frameworkSdkBuildVersion = frameworkSdkBuildVersion - this.androidVersion = androidVersion this.apiLevel = apiLevel + this.androidVersion = androidVersion + this.frameworkSdkBuildVersion = frameworkSdkBuildVersion + this.minJdkVersion = minJdkVersion } boolean isSupportedOnThisJdk() { |