Skip to content

Commit

Permalink
Update dependencies; Fix #7 which is about Butterknife proguard.
Browse files Browse the repository at this point in the history
  • Loading branch information
zhanghai committed May 29, 2016
1 parent 2e91869 commit 83f7786
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 14 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.0.0'
classpath 'com.android.tools.build:gradle:2.1.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.3.0'
compile 'com.android.support:support-annotations:23.3.0'
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:support-annotations:23.4.0'
}

apply from: '../gradle-mvn-push.gradle'
20 changes: 16 additions & 4 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,23 @@ android {
}
}

buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
}
}

apply plugin: 'com.neenbedankt.android-apt'

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.3.0'
compile 'com.android.support:preference-v7:23.3.0'
compile 'com.android.support:preference-v14:23.3.0'
compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:preference-v7:23.4.0'
compile 'com.android.support:preference-v14:23.4.0'
compile 'com.jakewharton:butterknife:8.0.1'
apt 'com.jakewharton:butterknife-compiler:8.0.1'
compile project(':library')
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import java.util.ArrayList;
import java.util.List;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;
import me.zhanghai.android.patternlock.PatternView;
import me.zhanghai.android.patternlock.sample.R;
Expand All @@ -30,11 +30,11 @@ public class AboutActivity extends ThemedAppCompatActivity {
LOGO_PATTERN.add(PatternView.Cell.of(1, 1));
}

@Bind(R.id.pattern_view)
@BindView(R.id.pattern_view)
PatternView mPatternView;
@Bind(R.id.version_text)
@BindView(R.id.version_text)
TextView mVersionText;
@Bind(R.id.github_text)
@BindView(R.id.github_text)
TextView mGitHubText;

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
import android.view.View;
import android.widget.Button;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;
import me.zhanghai.android.patternlock.sample.R;
import me.zhanghai.android.patternlock.sample.util.PatternLockUtils;
import me.zhanghai.android.patternlock.sample.util.ToastUtils;

public class ResetPatternActivity extends ThemedAppCompatActivity {

@Bind(R.id.ok_button)
@BindView(R.id.ok_button)
Button mOkButton;
@Bind(R.id.cancel_button)
@BindView(R.id.cancel_button)
Button mCancelButton;

@Override
Expand Down

0 comments on commit 83f7786

Please sign in to comment.