From 070e19f432b8cb3a21325e61d7f27880551b04b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rayco=20Aran=CC=83a=20Rodri=CC=81guez?= Date: Thu, 3 Jul 2014 11:18:59 +0200 Subject: [PATCH 1/2] Fix problems with appcompat for Android L --- extras/actionbarcompat/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/actionbarcompat/build.gradle b/extras/actionbarcompat/build.gradle index a5c97604..a519015d 100644 --- a/extras/actionbarcompat/build.gradle +++ b/extras/actionbarcompat/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android-library' dependencies { compile project(':library') - compile "com.android.support:appcompat-v7:+" + compile "com.android.support:appcompat-v7:20+" } android { From f089428a1b391ffb364879eea8da8cf10cadd003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rayco=20Aran=CC=83a=20Rodri=CC=81guez?= Date: Mon, 21 Jul 2014 08:43:42 +0200 Subject: [PATCH 2/2] More fixes to project setup --- extras/actionbarcompat/build.gradle | 2 -- extras/actionbarsherlock/build.gradle | 4 +--- gradle.properties | 2 +- library/build.gradle | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/extras/actionbarcompat/build.gradle b/extras/actionbarcompat/build.gradle index a519015d..787c0670 100644 --- a/extras/actionbarcompat/build.gradle +++ b/extras/actionbarcompat/build.gradle @@ -14,5 +14,3 @@ android { targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) } } - -apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' diff --git a/extras/actionbarsherlock/build.gradle b/extras/actionbarsherlock/build.gradle index 06077adc..c258bfaf 100644 --- a/extras/actionbarsherlock/build.gradle +++ b/extras/actionbarsherlock/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android-library' dependencies { compile project(':library') - compile "com.android.support:support-v4:[18.0,)" + compile "com.android.support:support-v4:20+" compile ("com.actionbarsherlock:actionbarsherlock:[4.4,)@aar") { // Need to specifically exclude this as it is specified in ActionBarSherlock pom exclude group: 'com.google.android', module: 'support-v4' @@ -18,5 +18,3 @@ android { targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) } } - -apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' diff --git a/gradle.properties b/gradle.properties index f3301797..03c984c6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,5 +14,5 @@ POM_DEVELOPER_ID=chrisbanes POM_DEVELOPER_NAME=Chris Banes ANDROID_BUILD_TARGET_SDK_VERSION=19 -ANDROID_BUILD_TOOLS_VERSION=19.0.3 +ANDROID_BUILD_TOOLS_VERSION=20 ANDROID_BUILD_SDK_VERSION=19 diff --git a/library/build.gradle b/library/build.gradle index 5e57e641..7a40249f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -14,5 +14,3 @@ android { targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) } } - -apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' \ No newline at end of file