You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2014/08/02 15:35:08 UTC
svn commit: r1615313 -
/httpcomponents/httpclient-android/trunk/buildSrc/src/main/groovy/Utils.groovy
Author: olegk
Date: Sat Aug 2 13:35:08 2014
New Revision: 1615313
URL: http://svn.apache.org/r1615313
Log:
Fixed copying of AndroidManifest.xml
Modified:
httpcomponents/httpclient-android/trunk/buildSrc/src/main/groovy/Utils.groovy
Modified: httpcomponents/httpclient-android/trunk/buildSrc/src/main/groovy/Utils.groovy
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/trunk/buildSrc/src/main/groovy/Utils.groovy?rev=1615313&r1=1615312&r2=1615313&view=diff
==============================================================================
--- httpcomponents/httpclient-android/trunk/buildSrc/src/main/groovy/Utils.groovy (original)
+++ httpcomponents/httpclient-android/trunk/buildSrc/src/main/groovy/Utils.groovy Sat Aug 2 13:35:08 2014
@@ -90,12 +90,6 @@ class Utils {
commitEditor.closeDir()
}
- commitEditor.addFile(
- "httpclient-android/branches/${branchName}/src/main/AndroidManifest.xml",
- "httpclient-android/trunk/src/main/resources/AndroidManifest.xml", -1)
- commitEditor.closeFile(
- "httpclient-android/branches/${branchName}/src/main/AndroidManifest.xml", null)
-
commitEditor.closeDir()
commitEditor.closeDir()
commitEditor.closeDir()
@@ -105,6 +99,12 @@ class Utils {
commitEditor.closeDir()
// Done copying HttpCore
+ commitEditor.addFile(
+ "httpclient-android/branches/${branchName}/src/main/AndroidManifest.xml",
+ "httpclient-android/trunk/src/main/resources/AndroidManifest.xml", -1)
+ commitEditor.closeFile(
+ "httpclient-android/branches/${branchName}/src/main/AndroidManifest.xml", null)
+
commitEditor.closeDir()
commitEditor.closeDir()
// Done copying src