From 644ec7e04f47fce346cd95cf512bffcead4c52b0 Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Wed, 21 Dec 2016 14:35:38 -0800 Subject: [PATCH] Remove icsCompat build variant It is now replaced by gingerbreadCompat. Test: Existing tests pass: ./gradlew connectedAndroidTest Change-Id: I87583b2ca99fe6c65479ced88bfe5e9f8a992d75 --- library/build.gradle | 2 +- library/rules.gradle | 14 -------------- library/standalone-rules.gradle | 2 +- library/standalone.gradle | 2 +- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 7230aa8..bedb311 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -14,7 +14,7 @@ * * And then you can include the :setup-wizard-lib project as one of your dependencies * dependencies { - * compile project(path: ':setup-wizard-lib', configuration: 'icsCompatRelease') + * compile project(path: ':setup-wizard-lib', configuration: 'gingerbreadCompatRelease') * } */ diff --git a/library/rules.gradle b/library/rules.gradle index 7d84b17..fae6e3c 100644 --- a/library/rules.gradle +++ b/library/rules.gradle @@ -47,15 +47,6 @@ android { } } - // Compatibility build that provides the L layout for SDK versions ICS+ - icsCompat { - minSdkVersion 14 - dependencies { - icsCompatCompile deps['support-annotations'] - icsCompatCompile deps['support-appcompat-v7'] - } - } - // Deprecated. Use gingerbreadCompat instead. eclairMr1Compat { minSdkVersion 7 @@ -90,11 +81,6 @@ android { res.srcDirs = ['platform/res'] } - icsCompat { - java.srcDirs = ['eclair-mr1/src'] - res.srcDirs = ['eclair-mr1/res'] - } - eclairMr1Compat { java.srcDirs = ['eclair-mr1/src'] res.srcDirs = ['eclair-mr1/res'] diff --git a/library/standalone-rules.gradle b/library/standalone-rules.gradle index a7a73cf..7f505a1 100644 --- a/library/standalone-rules.gradle +++ b/library/standalone-rules.gradle @@ -9,7 +9,7 @@ * * And then you can include the :setup-wizard-lib project as one of your dependencies * dependencies { - * compile project(path: ':setup-wizard-lib', configuration: 'icsCompatRelease') + * compile project(path: ':setup-wizard-lib', configuration: 'gingerbreadCompatRelease') * } */ diff --git a/library/standalone.gradle b/library/standalone.gradle index 2a71352..557820d 100644 --- a/library/standalone.gradle +++ b/library/standalone.gradle @@ -10,7 +10,7 @@ * * And then you can include the :setup-wizard-lib project as one of your dependencies * dependencies { - * compile project(path: ':setup-wizard-lib', configuration: 'icsCompatRelease') + * compile project(path: ':setup-wizard-lib', configuration: 'gingerbreadCompatRelease') * } */