Skip to content

Commit

Permalink
Merge pull request #9 from InflationX/jb/fix-lint
Browse files Browse the repository at this point in the history
Fix lint errors
  • Loading branch information
jbarr21 authored Mar 13, 2017
2 parents 755f947 + bf00a00 commit 4e19c93
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
13 changes: 9 additions & 4 deletions ViewPumpSample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
buildToolsVersion "24.0.0"
compileSdkVersion 25
buildToolsVersion "25.0.1"

defaultConfig {
minSdkVersion 14
targetSdkVersion 24
versionCode project.ext.versionCodeInt
versionName version
}

buildTypes {
debug {
minifyEnabled true
Expand All @@ -20,12 +21,16 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

lintOptions {
disable 'AppCompatCustomView'
}
}

dependencies {
compile project(':viewpump')
compile 'com.android.support:support-v4:24.0.0'
compile 'com.android.support:appcompat-v7:24.0.0'
compile 'com.android.support:support-v4:25.0.1'
compile 'com.android.support:appcompat-v7:25.0.1'

compile 'com.jakewharton:butterknife:8.2.1'

Expand Down
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 {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ public static void invokeMethod(Object object, Method method, Object... args) {
try {
if (method == null) return;
method.invoke(object, args);
} catch (IllegalAccessException | InvocationTargetException e) {
} catch (IllegalAccessException e) {
Log.d(TAG, "Can't access method using reflection", e);
} catch (InvocationTargetException e) {
Log.d(TAG, "Can't invoke method using reflection", e);
}
}
Expand Down

0 comments on commit 4e19c93

Please sign in to comment.