From 1ee9448fb0eeff7f8ca5e76dcb0026f24272f7cf Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Thu, 14 Mar 2013 09:26:07 -0700 Subject: [PATCH] Bump to latest Butter Knife and Dagger (SNAPSHOT). Fix a few field scopes to enable proper code generation for both libraries. --- app/pom.xml | 10 +++++----- .../bootstrap/BootstrapServiceProvider.java | 4 ++-- .../bootstrap/authenticator/ApiKeyProvider.java | 2 +- .../BootstrapAuthenticatorActivity.java | 6 +++--- .../android/bootstrap/core/TimerService.java | 2 +- .../android/bootstrap/ui/CarouselActivity.java | 4 ++-- .../android/bootstrap/ui/UserListFragment.java | 4 ++-- pom.xml | 14 ++++++++++++++ 8 files changed, 30 insertions(+), 16 deletions(-) diff --git a/app/pom.xml b/app/pom.xml index 5696d20..c62b8b1 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -17,7 +17,7 @@ 4.2.0 - 0.9 + 1.0-SNAPSHOT @@ -32,12 +32,12 @@ 2.2.2 - com.squareup + com.squareup.dagger dagger ${dagger.version} - com.squareup + com.squareup.dagger dagger-compiler ${dagger.version} true @@ -45,7 +45,7 @@ com.jakewharton butterknife - 1.2.0 + 1.2.2 com.actionbarsherlock @@ -118,7 +118,7 @@ android-maven-plugin - com.squareup + com.squareup.dagger dagger-compiler ${dagger.version} diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapServiceProvider.java b/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapServiceProvider.java index 5ca840c..6d03c8e 100644 --- a/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapServiceProvider.java +++ b/app/src/main/java/com/donnfelker/android/bootstrap/BootstrapServiceProvider.java @@ -16,8 +16,8 @@ */ public class BootstrapServiceProvider { - @Inject private ApiKeyProvider keyProvider; - @Inject private UserAgentProvider userAgentProvider; + @Inject ApiKeyProvider keyProvider; + @Inject UserAgentProvider userAgentProvider; /** * Get service for configured key provider diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/ApiKeyProvider.java b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/ApiKeyProvider.java index f4e1f76..d196578 100644 --- a/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/ApiKeyProvider.java +++ b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/ApiKeyProvider.java @@ -20,7 +20,7 @@ */ public class ApiKeyProvider { - @Inject private AccountManager accountManager; + @Inject AccountManager accountManager; /** * This call blocks, so shouldn't be called on the UI thread diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/BootstrapAuthenticatorActivity.java b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/BootstrapAuthenticatorActivity.java index 93eb4a4..6f55bd9 100644 --- a/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/BootstrapAuthenticatorActivity.java +++ b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/BootstrapAuthenticatorActivity.java @@ -88,9 +88,9 @@ public class BootstrapAuthenticatorActivity extends SherlockAccountAuthenticator private AccountManager accountManager; - @InjectView(id.et_email) private AutoCompleteTextView emailText; - @InjectView(id.et_password) private EditText passwordText; - @InjectView(id.b_signin) private Button signinButton; + @InjectView(id.et_email) AutoCompleteTextView emailText; + @InjectView(id.et_password) EditText passwordText; + @InjectView(id.b_signin) Button signinButton; private TextWatcher watcher = validationTextWatcher(); diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerService.java b/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerService.java index 2bb633a..1f08480 100644 --- a/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerService.java +++ b/app/src/main/java/com/donnfelker/android/bootstrap/core/TimerService.java @@ -25,7 +25,7 @@ public class TimerService extends Service { @Inject protected Bus BUS; - @Inject private NotificationManager notificationManager; + @Inject NotificationManager notificationManager; private boolean timerRunning = false; private boolean timerStarted; diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/CarouselActivity.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/CarouselActivity.java index c89f0d0..5e6277d 100644 --- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/CarouselActivity.java +++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/CarouselActivity.java @@ -23,8 +23,8 @@ */ public class CarouselActivity extends BootstrapFragmentActivity { - @InjectView(id.tpi_header) private TitlePageIndicator indicator; - @InjectView(id.vp_pages) private ViewPager pager; + @InjectView(id.tpi_header) TitlePageIndicator indicator; + @InjectView(id.vp_pages) ViewPager pager; @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListFragment.java b/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListFragment.java index 3b42235..331ceec 100644 --- a/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListFragment.java +++ b/app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListFragment.java @@ -24,8 +24,8 @@ public class UserListFragment extends ItemListFragment { - @Inject private BootstrapServiceProvider serviceProvider; - @Inject private AvatarLoader avatars; + @Inject BootstrapServiceProvider serviceProvider; + @Inject AvatarLoader avatars; @Inject protected LogoutService logoutService; @Override diff --git a/pom.xml b/pom.xml index ce4b276..0c48910 100644 --- a/pom.xml +++ b/pom.xml @@ -69,4 +69,18 @@ + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots + + false + + + true + + +