svn commit: r1553876 - in /httpcomponents/httpclient-android/trunk: build.gradle buildSrc/build.gradle

[ol...@apache.org]

Author: olegk
Date: Sat Dec 28 17:07:33 2013
New Revision: 1553876

URL: http://svn.apache.org/r1553876
Log:
Added task to replace Commons Logging with Android Logging APIs; added SVN update and commit tasks; upgraded SvnKit to version 1.7.11

Modified:
    httpcomponents/httpclient-android/trunk/build.gradle
    httpcomponents/httpclient-android/trunk/buildSrc/build.gradle

Modified: httpcomponents/httpclient-android/trunk/build.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/trunk/build.gradle?rev=1553876&r1=1553875&r2=1553876&view=diff
==============================================================================
--- httpcomponents/httpclient-android/trunk/build.gradle (original)
+++ httpcomponents/httpclient-android/trunk/build.gradle Sat Dec 28 17:07:33 2013
@@ -43,6 +43,29 @@ task checkout(dependsOn: createSvnBranch
     }
 }
 
+task update {
+    group = 'SVN'
+    description = "Updates local checkout from ${branchUri}"
+    onlyIf {
+        localDir.exists()
+    }
+    doLast {
+        Svn.update(localDir)
+    }
+}
+
+task commit {
+    group = 'SVN'
+    description = "Commits local changes to ${branchUri}"
+    onlyIf {
+        localDir.exists()
+    }
+    doLast {
+        Svn.commit(localDir, "Android specific modifications of HttpClient ${HTTPCLIENT_VERSION}")
+        println()
+    }
+}
+
 task prepare(dependsOn: checkout) {
     group = 'Code'
     description = "Prepares code migration"
@@ -125,9 +148,9 @@ task prepare(dependsOn: checkout) {
     }
 }
 
-task moveCode(dependsOn: prepare) {
+task shade(dependsOn: prepare) {
     group = 'SVN'
-    description = "Updates local SVN checkout"
+    description = "Shades newer implementation classes"
     doLast {
         Set<String> classesToRemove = []
         reservedClassesFile.eachLine { String line ->
@@ -155,9 +178,9 @@ task moveCode(dependsOn: prepare) {
     }
 }
 
-task rewriteCode(dependsOn: moveCode) {
+task rewriteImpl(dependsOn: shade) {
     group = 'Code'
-    description = "Rewrites code"
+    description = "Rewrites implementation classes"
     doLast {
         Set<String> allClasses = []
         allClassesFile.eachLine { String line ->
@@ -194,5 +217,30 @@ task rewriteCode(dependsOn: moveCode) {
             }
         }
     }
-
 }
+
+task rewriteLogging(dependsOn: rewriteImpl) {
+    group = 'Code'
+    description = "Rewrites logging"
+    doLast {
+        List<Replacement> replacements = [
+                new Replacement(~/^import org\.apache\.commons\.logging\.LogFactory;/, ''),
+                new Replacement(~/^(.*)Log log = LogFactory.getLog\(.*\);/, '$1String tag = getClass().getName();'),
+                new Replacement(~/^import org\.apache\.commons\.logging\.Log;/, 'import android.util.Log;'),
+                new Replacement(~/^(.*?)(?:this\.)?log\.debug\((.*)$/, '$1Log.d(tag, $2'),
+                new Replacement(~/^(.*?)(?:this\.)?log\.isDebugEnabled\(\)(.*)$/, '$1Log.isLoggable(tag, Log.DEBUG)$2'),
+                new Replacement(~/^(.*?)(?:this\.)?log\.info\((.*)$/, '$1Log.i(tag, $2'),
+                new Replacement(~/^(.*?)(?:this\.)?log\.isInfoEnabled\(\)(.*)$/, '$1Log.isLoggable(tag, Log.INFO)$2'),
+                new Replacement(~/^(.*?)(?:this\.)?log\.warn\((.*)$/, '$1Log.w(tag, $2'),
+                new Replacement(~/^(.*?)(?:this\.)?log\.isWarnEnabled\(\)(.*)$/, '$1Log.isLoggable(tag, Log.WARN)$2'),
+                new Replacement(~/^(.*?)(?:this\.)?log\.error\((.*)$/, '$1Log.e(tag, $2'),
+                new Replacement(~/^(.*?)(?:this\.)?log\.isErrorEnabled\(\)(.*)$/, '$1Log.isLoggable(tag, Log.ERROR)$2')
+        ]
+        srcRoot.traverse(namefilter: ~/.*\.java$/) { File file ->
+            if (!file.directory) {
+                HC.replacePatterns(file, replacements)
+            }
+        }
+    }
+
+}
\ No newline at end of file

Modified: httpcomponents/httpclient-android/trunk/buildSrc/build.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/trunk/buildSrc/build.gradle?rev=1553876&r1=1553875&r2=1553876&view=diff
==============================================================================
--- httpcomponents/httpclient-android/trunk/buildSrc/build.gradle (original)
+++ httpcomponents/httpclient-android/trunk/buildSrc/build.gradle Sat Dec 28 17:07:33 2013
@@ -2,13 +2,16 @@ apply plugin: 'groovy'
 
 repositories {
     mavenCentral()
+    maven {
+        url "http://maven.tmatesoft.com/content/repositories/releases/"
+    }
 }
 
 dependencies {
     compile gradleApi()
     compile localGroovy()
-    compile 'org.tmatesoft.svnkit:svnkit:1.7.8'
-    compile 'org.tmatesoft.svnkit:svnkit-cli:1.7.8'
+    compile 'org.tmatesoft.svnkit:svnkit:1.7.+'
+    compile 'org.tmatesoft.svnkit:svnkit-cli:1.7.+'
     compile 'org.reflections:reflections:0.9.9-RC1'
     runtime 'javax.servlet:servlet-api:2.5'
     runtime 'org.slf4j:slf4j-nop:1.7.5'