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/03/02 17:35:00 UTC
svn commit: r1573330 - /httpcomponents/httpclient-android/trunk/build.gradle
Author: olegk
Date: Sun Mar 2 16:35:00 2014
New Revision: 1573330
URL: http://svn.apache.org/r1573330
Log:
Minor tweaks to migration script; documentation
Modified:
httpcomponents/httpclient-android/trunk/build.gradle
Modified: httpcomponents/httpclient-android/trunk/build.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/trunk/build.gradle?rev=1573330&r1=1573329&r2=1573330&view=diff
==============================================================================
--- httpcomponents/httpclient-android/trunk/build.gradle (original)
+++ httpcomponents/httpclient-android/trunk/build.gradle Sun Mar 2 16:35:00 2014
@@ -125,8 +125,8 @@ task prepare(dependsOn: checkout) {
!allClassesFile.exists() || !reservedClassesFile.exists()
}
doLast {
- Collection<File> jars = configurations.hcApi.resolvedConfiguration.resolvedArtifacts.collect { ResolvedArtifact artifact ->
- artifact.file
+ Collection<File> jars = configurations.hcApi.resolvedConfiguration.resolvedArtifacts.collect {
+ ResolvedArtifact artifact -> artifact.file
}
// Complete set of classes in 'org.apache.http' namespace
@@ -218,9 +218,13 @@ task prepare(dependsOn: checkout) {
}
}
-task shade(dependsOn: prepare) {
+/**
+ * Removes reserved classes and interfaces, as well SPNEGO and Kerberos classes unsupported
+ * by Android.
+ */
+task removeReserved(dependsOn: prepare) {
group = 'SVN'
- description = "Shades newer implementation classes"
+ description = "Removes reserved classes and interfaces"
doLast {
Set<String> classesToRemove = [
'org.apache.http.impl.auth.GGSSchemeBase',
@@ -243,6 +247,16 @@ task shade(dependsOn: prepare) {
if (!filesToRemove.empty) {
Svn.scheduleForRemoval(filesToRemove)
}
+ }
+}
+
+/**
+ * 'shades' newer implementation classes.
+ */
+task shade(dependsOn: removeReserved) {
+ group = 'SVN'
+ description = "Shades newer implementation classes"
+ doLast {
allClassesFile.eachLine { String line ->
String name = line.replaceAll('\\.', '/')
File src = new File(srcRoot, name + '.java')
@@ -254,7 +268,10 @@ task shade(dependsOn: prepare) {
}
}
-task rewriteImpl(dependsOn: shade) {
+/**
+ * Rewrites implementation classes to use 'shaded' implementation classes where needed.
+ */
+task rewrite(dependsOn: shade) {
group = 'Code'
description = "Rewrites implementation classes"
doLast {