Bump to latest Butter Knife and Dagger (SNAPSHOT).

Fix a few field scopes to enable proper code generation for both libraries.
aristides · Mar 14, 2013 · 1ee9448 · 1ee9448
1 parent bbb86e0
commit 1ee9448
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 16 deletions.
diff --git a/app/pom.xml b/app/pom.xml
@@ -17,7 +17,7 @@
 
     <properties>
         <abs.version>4.2.0</abs.version>
-        <dagger.version>0.9</dagger.version>
+        <dagger.version>1.0-SNAPSHOT</dagger.version>
     </properties>
     <dependencies>
         <dependency>
@@ -32,20 +32,20 @@
             <version>2.2.2</version>
         </dependency>
         <dependency>
-            <groupId>com.squareup</groupId>
+            <groupId>com.squareup.dagger</groupId>
             <artifactId>dagger</artifactId>
             <version>${dagger.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.squareup</groupId>
+            <groupId>com.squareup.dagger</groupId>
             <artifactId>dagger-compiler</artifactId>
             <version>${dagger.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.jakewharton</groupId>
             <artifactId>butterknife</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.2</version>
         </dependency>
         <dependency>
             <groupId>com.actionbarsherlock</groupId>
@@ -118,7 +118,7 @@
                 <artifactId>android-maven-plugin</artifactId>
                 <dependencies>
                     <dependency>
-                        <groupId>com.squareup</groupId>
+                        <groupId>com.squareup.dagger</groupId>
                         <artifactId>dagger-compiler</artifactId>
                         <version>${dagger.version}</version>
                     </dependency>

diff --git 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
@@ -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/...n/java/com/donnfelker/android/bootstrap/authenticator/BootstrapAuthenticatorActivity.java b/...n/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
@@ -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
@@ -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
@@ -24,8 +24,8 @@
 
 public class UserListFragment  extends ItemListFragment<User> {
 
-    @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
@@ -69,4 +69,18 @@
             </plugins>
         </pluginManagement>
     </build>
+
+    <repositories>
+        <repository>
+            <id>sonatype-nexus-snapshots</id>
+            <name>Sonatype Nexus Snapshots</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>