commit 0f9eac15956c7e8ee1d0fd555b7cdb1c87867704
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Oct 06 19:13:18 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 06 19:13:18 2017 +0000
tree ac121d173f951aa081fae5d6fe7b32c1c86227e8
parent 72bb9952e7db82279af7bd4cc770a619947d39f3
parent 4413e7fe250b31893dd3d564bdc4906a4af04ca2

Merge "Fix the crash caused by bad minSdkVersion check." into oc-mr1-support-27.0-dev

buildSrc/src/main/groovy/android/support/SupportAndroidLibraryPlugin.groovy

diff --git a/buildSrc/src/main/groovy/android/support/SupportAndroidLibraryPlugin.groovy b/buildSrc/src/main/groovy/android/support/SupportAndroidLibraryPlugin.groovy
index 6afded5..b60fddc 100644
--- a/buildSrc/src/main/groovy/android/support/SupportAndroidLibraryPlugin.groovy
+++ b/buildSrc/src/main/groovy/android/support/SupportAndroidLibraryPlugin.groovy
@@ -51,8 +51,8 @@
             // compatible with API < 24, so use Java 7 for both source AND target.
             final JavaVersion javaVersion;
             if (supportLibraryExtension.java8Library) {
-                if (library.defaultConfig.minSdkVersion < 24) {
-                    throw IllegalArgumentException("Libraries can only support Java 8 if "
+                if (library.defaultConfig.minSdkVersion.apiLevel < 24) {
+                    throw new IllegalArgumentException("Libraries can only support Java 8 if "
                             + "minSdkVersion is 24 or higher");
                 }
                 javaVersion = JavaVersion.VERSION_1_8