Skip to content
This repository was archived by the owner on Dec 1, 2017. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:0.13.+'
classpath 'com.android.tools.build:gradle:0.14.0'
}
}

15 changes: 15 additions & 0 deletions gradle/scripts/gradle-mvn-push.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions gradle/scripts/gradle-plugin-mvn-push.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
6 changes: 4 additions & 2 deletions library/src/main/java/org/lucasr/probe/Interceptor.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class LayoutResourceParser {
name == "include" ||
name == "ViewStub" ||
name == "fragment" ||
name == "Space" ||
name == "requestLayout") {
className = null
} else if (name.indexOf('.') == -1) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down