From b0256ca72ab4511583073fd10e4fce680fabb8c7 Mon Sep 17 00:00:00 2001 From: Matthew Bishop Date: Tue, 4 Nov 2014 10:52:24 -0700 Subject: [PATCH 1/5] [gradle] Add local install option to build scripts --- gradle/scripts/gradle-mvn-push.gradle | 15 +++++++++++++++ gradle/scripts/gradle-plugin-mvn-push.gradle | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/gradle/scripts/gradle-mvn-push.gradle b/gradle/scripts/gradle-mvn-push.gradle index f5f4129..5581b42 100644 --- a/gradle/scripts/gradle-mvn-push.gradle +++ b/gradle/scripts/gradle-mvn-push.gradle @@ -87,6 +87,21 @@ afterEvaluate { project -> } } + task installLibrary(type: Upload) { + description "Installs the artifacts to the local Maven repository." + configuration = configurations['archives'] + repositories { + mavenDeployer { + + pom.groupId = GROUP + pom.artifactId = POM_ARTIFACT_ID + pom.version = VERSION_NAME + + repository url: "file://${System.properties['user.home']}/.m2/repository" + } + } + } + signing { required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } sign configurations.archives diff --git a/gradle/scripts/gradle-plugin-mvn-push.gradle b/gradle/scripts/gradle-plugin-mvn-push.gradle index 2914a23..fef6b47 100644 --- a/gradle/scripts/gradle-plugin-mvn-push.gradle +++ b/gradle/scripts/gradle-plugin-mvn-push.gradle @@ -91,6 +91,20 @@ afterEvaluate { project -> } } + task installPlugin(type: Upload) { + description "Installs the plugin artifacts to the local Maven repository." + configuration = configurations['archives'] + repositories { + mavenDeployer { + pom.groupId = GROUP + pom.artifactId = POM_ARTIFACT_ID + pom.version = VERSION_NAME + + repository url: "file://${System.properties['user.home']}/.m2/repository" + } + } + } + signing { required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } sign configurations.archives From b95b850d839bdb274f45a17c6103377c2aa9ed84 Mon Sep 17 00:00:00 2001 From: Matthew Bishop Date: Tue, 4 Nov 2014 10:53:36 -0700 Subject: [PATCH 2/5] [build] Bump android gradle plugin version --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8698610..da3aff7 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.13.+' + classpath 'com.android.tools.build:gradle:0.14.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9a893af..992dda0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Tue Nov 04 10:53:09 MST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip From 31f362f06d8814601e819ad268a0d6c764602042 Mon Sep 17 00:00:00 2001 From: Matthew Bishop Date: Tue, 4 Nov 2014 11:30:30 -0700 Subject: [PATCH 3/5] [library] Don't invokeForceLayout if view isn't a ViewProxy --- library/src/main/java/org/lucasr/probe/Interceptor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/org/lucasr/probe/Interceptor.java b/library/src/main/java/org/lucasr/probe/Interceptor.java index 23b6ef6..0fc659d 100644 --- a/library/src/main/java/org/lucasr/probe/Interceptor.java +++ b/library/src/main/java/org/lucasr/probe/Interceptor.java @@ -137,8 +137,10 @@ public void forceLayout(View view) { * Performs a {@link View#forceLayout()} call on the given {@link View}. */ protected final void invokeForceLayout(View view) { - final ViewProxy proxy = (ViewProxy) view; - proxy.invokeForceLayout(); + if(view instanceof ViewProxy) { + final ViewProxy proxy = (ViewProxy) view; + proxy.invokeForceLayout(); + } } /** From 238ef1f09d58dc84b2d96f0114fdbaec24942f06 Mon Sep 17 00:00:00 2001 From: Matthew Bishop Date: Tue, 4 Nov 2014 13:26:35 -0700 Subject: [PATCH 4/5] [gradle] Make onMeasure public in ViewProxyGenerator --- .../groovy/org/lucasr/probe/internal/ViewProxyGenerator.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/probe-gradle/src/main/groovy/org/lucasr/probe/internal/ViewProxyGenerator.groovy b/probe-gradle/src/main/groovy/org/lucasr/probe/internal/ViewProxyGenerator.groovy index 7aaec5a..6a13d3c 100644 --- a/probe-gradle/src/main/groovy/org/lucasr/probe/internal/ViewProxyGenerator.groovy +++ b/probe-gradle/src/main/groovy/org/lucasr/probe/internal/ViewProxyGenerator.groovy @@ -170,7 +170,8 @@ class ViewProxyGenerator { } private static void generateOnMeasureMethod(JavaWriter javaWriter) { - beginOnMeasureMethod(javaWriter, METHOD_ON_MEASURE, PROTECTED) + // must be public because android.widget.Switch has a public onMeasure method (despite all others being protected) + beginOnMeasureMethod(javaWriter, METHOD_ON_MEASURE, PUBLIC) generateInterceptorConditional(javaWriter, METHOD_ON_MEASURE, PARAM_WIDTH_SPEC, PARAM_HEIGHT_SPEC) javaWriter.endMethod() From e34714bbfba4d453484d1b84c8e4122dd98652db Mon Sep 17 00:00:00 2001 From: Matthew Bishop Date: Tue, 4 Nov 2014 13:37:19 -0700 Subject: [PATCH 5/5] [gradle] Ignore Space tags --- .../groovy/org/lucasr/probe/internal/LayoutResourceParser.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/probe-gradle/src/main/groovy/org/lucasr/probe/internal/LayoutResourceParser.groovy b/probe-gradle/src/main/groovy/org/lucasr/probe/internal/LayoutResourceParser.groovy index 80e5c74..9163b89 100644 --- a/probe-gradle/src/main/groovy/org/lucasr/probe/internal/LayoutResourceParser.groovy +++ b/probe-gradle/src/main/groovy/org/lucasr/probe/internal/LayoutResourceParser.groovy @@ -58,6 +58,7 @@ class LayoutResourceParser { name == "include" || name == "ViewStub" || name == "fragment" || + name == "Space" || name == "requestLayout") { className = null } else if (name.indexOf('.') == -1) {