From c6fb78ea320418c3c36c6d5501c264ebaf082fa0 Mon Sep 17 00:00:00 2001 From: Carmen Alvarez Date: Sun, 8 Nov 2015 23:18:06 +0100 Subject: [PATCH 1/3] Removed prebuild sed patch from ca.rmen.android.frenchcalendar.txt. This is not needed. In addition to only declaring the google play services dependency in the wear flavor (not used in frdoid), like this: ``` wearCompile 'com.google.android.gms:play-services:6.1.71' ``` there is an additional check to ensure that this line is not even executed, as long as at least one of the tasks in the gradle command line contains the string "foss". In settings.gradle: ``` boolean includeWear=true; // If we are building with a "foss" task, don't include the wearable module. for(String taskName : startParameter.taskNames) { if(taskName.contains("Foss")) includeWear=false; } include ':handheld', ':common' if(includeWear) include ':wearable' ``` In handheld/build.gradle: ``` // Package the wear apk inside this one (only for the 'wear' flavor) if(rootProject.findProject("wearable") != null) { wearCompile 'com.google.android.gms:play-services:6.1.71' wearWearApp project(':wearable') } ``` I understand that most projects with proprietary vs foss flavors don't have this additional check, which is why the sed patch is usually needed. --- metadata/ca.rmen.android.frenchcalendar.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/metadata/ca.rmen.android.frenchcalendar.txt b/metadata/ca.rmen.android.frenchcalendar.txt index 06e1c76093..7b63480a5d 100644 --- a/metadata/ca.rmen.android.frenchcalendar.txt +++ b/metadata/ca.rmen.android.frenchcalendar.txt @@ -71,13 +71,11 @@ Build:1.8.0,180 commit=release-1.8.0 subdir=handheld gradle=foss - prebuild=sed -i '/play-services/d' build.gradle ../wearable/build.gradle Build:1.8.1,181 commit=release-1.8.1 subdir=handheld gradle=foss - prebuild=sed -i '/play-services/d' build.gradle ../wearable/build.gradle Auto Update Mode:Version release-%v Update Check Mode:Tags ^release- From a0c973a9f12b5ba3e7fb616f38484c7a29d21a88 Mon Sep 17 00:00:00 2001 From: Carmen Alvarez Date: Mon, 9 Nov 2015 00:12:39 +0100 Subject: [PATCH 2/3] frenchcalendar: put back the sed patch, but only for the wearable build.gradle Not sure why this is needed though. --- metadata/ca.rmen.android.frenchcalendar.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/metadata/ca.rmen.android.frenchcalendar.txt b/metadata/ca.rmen.android.frenchcalendar.txt index 7b63480a5d..bc280de5e3 100644 --- a/metadata/ca.rmen.android.frenchcalendar.txt +++ b/metadata/ca.rmen.android.frenchcalendar.txt @@ -71,11 +71,13 @@ Build:1.8.0,180 commit=release-1.8.0 subdir=handheld gradle=foss + prebuild=sed -i '/play-services/d' ../wearable/build.gradle Build:1.8.1,181 commit=release-1.8.1 subdir=handheld gradle=foss + prebuild=sed -i '/play-services/d' ../wearable/build.gradle Auto Update Mode:Version release-%v Update Check Mode:Tags ^release- From 1a055d18473b848d679ee821254871a61e24141f Mon Sep 17 00:00:00 2001 From: Carmen Alvarez Date: Mon, 9 Nov 2015 01:25:12 +0100 Subject: [PATCH 3/3] french-calendar: don't scan the wearable/build.gradle file, as it is ignored by settings.gradle Instead of sed-patching the wearable/build.gradle file, which isn't even read when building french calendar, just ignore the file altogether, for the scanning phase. --- metadata/ca.rmen.android.frenchcalendar.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/ca.rmen.android.frenchcalendar.txt b/metadata/ca.rmen.android.frenchcalendar.txt index bc280de5e3..95ac5595ac 100644 --- a/metadata/ca.rmen.android.frenchcalendar.txt +++ b/metadata/ca.rmen.android.frenchcalendar.txt @@ -71,13 +71,13 @@ Build:1.8.0,180 commit=release-1.8.0 subdir=handheld gradle=foss - prebuild=sed -i '/play-services/d' ../wearable/build.gradle + scanignore=wearable/build.gradle Build:1.8.1,181 commit=release-1.8.1 subdir=handheld gradle=foss - prebuild=sed -i '/play-services/d' ../wearable/build.gradle + scanignore=wearable/build.gradle Auto Update Mode:Version release-%v Update Check Mode:Tags ^release-