Return-Path: X-Original-To: apmail-cordova-dev-archive@www.apache.org Delivered-To: apmail-cordova-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 134D6CFC6 for ; Thu, 8 Jan 2015 18:51:09 +0000 (UTC) Received: (qmail 64331 invoked by uid 500); 8 Jan 2015 18:51:10 -0000 Delivered-To: apmail-cordova-dev-archive@cordova.apache.org Received: (qmail 64288 invoked by uid 500); 8 Jan 2015 18:51:10 -0000 Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list dev@cordova.apache.org Received: (qmail 64211 invoked by uid 99); 8 Jan 2015 18:51:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jan 2015 18:51:06 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of bowserj@gmail.com designates 209.85.223.173 as permitted sender) Received: from [209.85.223.173] (HELO mail-ie0-f173.google.com) (209.85.223.173) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jan 2015 18:50:41 +0000 Received: by mail-ie0-f173.google.com with SMTP id y20so11050263ier.4 for ; Thu, 08 Jan 2015 10:50:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:references:from:date:message-id:subject:to :content-type; bh=fgHPanOIInvMRf1DLAwu1nl/Do8e15VRsFD6+aNNT5I=; b=yPY1Kt9vKU7E0Es36ddqgvsH5Yel+hr/t5UPlZVy8GMse3gwuCqTOxDynNzzJCixAv Ozv1hlKlkq7PVNE8TJrSrni+acKTfmzudErEdp0vZ0QCmXfvJcB1ngsTeUahT6nOZXuQ fKOECWM3a5G5AciCwF/lK1OjPJsrDTyfyJqdJiONclSOWjA3Zuxe3axlquP5Idt9YWE5 8qWz/quXMDNuheAAhECPNnlGdmJGAb9JPEqF9/4CxsKSdO3IzVdczxoTTe5syk/vW6Xn hc1z8ZJ2or0RBp8Uk0FapS5lcCZCbMAL3CxuFyFJDN3qCe9zqt07FHD+3X0DPgoGsheg URPg== X-Received: by 10.50.50.140 with SMTP id c12mr16631197igo.5.1420743039674; Thu, 08 Jan 2015 10:50:39 -0800 (PST) MIME-Version: 1.0 References: From: Joe Bowser Date: Thu, 08 Jan 2015 18:50:39 +0000 Message-ID: Subject: Re: Cordova-Android 3.7.0 and 4.0.x releases. To: dev@cordova.apache.org Content-Type: multipart/alternative; boundary=047d7bdc117e327eec050c2884d6 X-Virus-Checked: Checked by ClamAV on apache.org --047d7bdc117e327eec050c2884d6 Content-Type: text/plain; charset=UTF-8 Right, I'm still trying to figure out how to get the command line to generate targetApi = 21. That said, I was hoping to have the merges be neater for CB-8026, since the changes are made in two different files, respectively. On Thu Jan 08 2015 at 10:48:50 AM Andrew Grieve wrote: > Yes! Sounds good to me! Although I'm not sure there's much point in > creating the 3.7.x branch until CB-8026 is resolved and we set targetApi = > 21 > > On Thu, Jan 8, 2015 at 1:44 PM, Joe Bowser wrote: > > > Sounds like this is all good. I'm going to create a 3.7.0 branch today > and > > start committing the fixes for CB-8026 into that. I'm going to hold off > on > > merging 4.0.x into master until I hear back from other people on this > > thread. > > > > On Wed Jan 07 2015 at 2:34:06 PM Joe Bowser wrote: > > > > > Hey > > > > > > Do we have a 3.7.0 branch ready yet? I want us to get that ready and > > merge > > > the 4.0.x stuff into the master branch once we get 3.7.0 out. That way > > we > > > can finally go back to having a regular dev process. > > > > > > Are people opposed to us merging the 4.0.x branch into master once we > > > release 3.7.x and just treating 4.0.x like a full release branch? > > > > > > Joe > > > > > > --047d7bdc117e327eec050c2884d6--