Skip to content

Commit 1ee9448

Browse files
committed
Bump to latest Butter Knife and Dagger (SNAPSHOT).
Fix a few field scopes to enable proper code generation for both libraries.
1 parent bbb86e0 commit 1ee9448

File tree

8 files changed

+30
-16
lines changed

8 files changed

+30
-16
lines changed

app/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<properties>
1919
<abs.version>4.2.0</abs.version>
20-
<dagger.version>0.9</dagger.version>
20+
<dagger.version>1.0-SNAPSHOT</dagger.version>
2121
</properties>
2222
<dependencies>
2323
<dependency>
@@ -32,20 +32,20 @@
3232
<version>2.2.2</version>
3333
</dependency>
3434
<dependency>
35-
<groupId>com.squareup</groupId>
35+
<groupId>com.squareup.dagger</groupId>
3636
<artifactId>dagger</artifactId>
3737
<version>${dagger.version}</version>
3838
</dependency>
3939
<dependency>
40-
<groupId>com.squareup</groupId>
40+
<groupId>com.squareup.dagger</groupId>
4141
<artifactId>dagger-compiler</artifactId>
4242
<version>${dagger.version}</version>
4343
<optional>true</optional>
4444
</dependency>
4545
<dependency>
4646
<groupId>com.jakewharton</groupId>
4747
<artifactId>butterknife</artifactId>
48-
<version>1.2.0</version>
48+
<version>1.2.2</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>com.actionbarsherlock</groupId>
@@ -118,7 +118,7 @@
118118
<artifactId>android-maven-plugin</artifactId>
119119
<dependencies>
120120
<dependency>
121-
<groupId>com.squareup</groupId>
121+
<groupId>com.squareup.dagger</groupId>
122122
<artifactId>dagger-compiler</artifactId>
123123
<version>${dagger.version}</version>
124124
</dependency>

app/src/main/java/com/donnfelker/android/bootstrap/BootstrapServiceProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
public class BootstrapServiceProvider {
1818

19-
@Inject private ApiKeyProvider keyProvider;
20-
@Inject private UserAgentProvider userAgentProvider;
19+
@Inject ApiKeyProvider keyProvider;
20+
@Inject UserAgentProvider userAgentProvider;
2121

2222
/**
2323
* Get service for configured key provider

app/src/main/java/com/donnfelker/android/bootstrap/authenticator/ApiKeyProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
public class ApiKeyProvider {
2222

23-
@Inject private AccountManager accountManager;
23+
@Inject AccountManager accountManager;
2424

2525
/**
2626
* This call blocks, so shouldn't be called on the UI thread

app/src/main/java/com/donnfelker/android/bootstrap/authenticator/BootstrapAuthenticatorActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ public class BootstrapAuthenticatorActivity extends SherlockAccountAuthenticator
8888

8989
private AccountManager accountManager;
9090

91-
@InjectView(id.et_email) private AutoCompleteTextView emailText;
92-
@InjectView(id.et_password) private EditText passwordText;
93-
@InjectView(id.b_signin) private Button signinButton;
91+
@InjectView(id.et_email) AutoCompleteTextView emailText;
92+
@InjectView(id.et_password) EditText passwordText;
93+
@InjectView(id.b_signin) Button signinButton;
9494

9595
private TextWatcher watcher = validationTextWatcher();
9696

app/src/main/java/com/donnfelker/android/bootstrap/core/TimerService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
public class TimerService extends Service {
2626

2727
@Inject protected Bus BUS;
28-
@Inject private NotificationManager notificationManager;
28+
@Inject NotificationManager notificationManager;
2929

3030
private boolean timerRunning = false;
3131
private boolean timerStarted;

app/src/main/java/com/donnfelker/android/bootstrap/ui/CarouselActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424
public class CarouselActivity extends BootstrapFragmentActivity {
2525

26-
@InjectView(id.tpi_header) private TitlePageIndicator indicator;
27-
@InjectView(id.vp_pages) private ViewPager pager;
26+
@InjectView(id.tpi_header) TitlePageIndicator indicator;
27+
@InjectView(id.vp_pages) ViewPager pager;
2828

2929
@Override
3030
protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
public class UserListFragment extends ItemListFragment<User> {
2626

27-
@Inject private BootstrapServiceProvider serviceProvider;
28-
@Inject private AvatarLoader avatars;
27+
@Inject BootstrapServiceProvider serviceProvider;
28+
@Inject AvatarLoader avatars;
2929
@Inject protected LogoutService logoutService;
3030

3131
@Override

pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,18 @@
6969
</plugins>
7070
</pluginManagement>
7171
</build>
72+
73+
<repositories>
74+
<repository>
75+
<id>sonatype-nexus-snapshots</id>
76+
<name>Sonatype Nexus Snapshots</name>
77+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
78+
<releases>
79+
<enabled>false</enabled>
80+
</releases>
81+
<snapshots>
82+
<enabled>true</enabled>
83+
</snapshots>
84+
</repository>
85+
</repositories>
7286
</project>

0 commit comments

Comments
 (0)