Skip to content

combined dagger bump #4269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 2 commits into from
Jul 29, 2019
Merged

combined dagger bump #4269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e21f409
combined dagger bump
tobiasKaminsky Jul 26, 2019
976e38e
Migrate main app to new Dagger injector API
ezaquarii Jul 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ configurations {

ext {
jacocoVersion = "0.8.2"
daggerVersion = "2.24"
androidLibraryVersion = "master-SNAPSHOT"

travisBuild = System.getenv("TRAVIS") == "true"
Expand Down Expand Up @@ -285,11 +286,11 @@ dependencies {
spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.9.0'
spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.6'

implementation 'com.google.dagger:dagger:2.23.2'
implementation 'com.google.dagger:dagger-android:2.23.2'
implementation 'com.google.dagger:dagger-android-support:2.23.2'
kapt 'com.google.dagger:dagger-compiler:2.23.2'
kapt 'com.google.dagger:dagger-android-processor:2.23.2'
implementation "com.google.dagger:dagger:$daggerVersion"
implementation "com.google.dagger:dagger-android:$daggerVersion"
implementation "com.google.dagger:dagger-android-support:$daggerVersion"
kapt "com.google.dagger:dagger-compiler:$daggerVersion"
kapt "com.google.dagger:dagger-android-processor:$daggerVersion"

compileOnly "org.projectlombok:lombok:1.18.8"
annotationProcessor "org.projectlombok:lombok:1.18.8"
Expand Down
54 changes: 5 additions & 49 deletions src/main/java/com/owncloud/android/MainApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
import android.app.Activity;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.ContentProvider;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
Expand Down Expand Up @@ -91,15 +88,10 @@
import androidx.annotation.StringRes;
import androidx.appcompat.app.AlertDialog;
import androidx.core.util.Pair;
import androidx.fragment.app.Fragment;
import androidx.multidex.MultiDexApplication;
import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector;
import dagger.android.HasActivityInjector;
import dagger.android.HasBroadcastReceiverInjector;
import dagger.android.HasContentProviderInjector;
import dagger.android.HasServiceInjector;
import dagger.android.support.HasSupportFragmentInjector;
import dagger.android.HasAndroidInjector;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

import static com.owncloud.android.ui.activity.ContactsPreferenceActivity.PREFERENCE_CONTACTS_AUTOMATIC_BACKUP;
Expand All @@ -110,12 +102,7 @@
* <p>
* Contains methods to build the "static" strings. These strings were before constants in different classes
*/
public class MainApp extends MultiDexApplication implements
HasActivityInjector,
HasSupportFragmentInjector,
HasServiceInjector,
HasContentProviderInjector,
HasBroadcastReceiverInjector {
public class MainApp extends MultiDexApplication implements HasAndroidInjector {

public static final OwnCloudVersion OUTDATED_SERVER_VERSION = OwnCloudVersion.nextcloud_13;
public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_12;
Expand All @@ -132,19 +119,7 @@ public class MainApp extends MultiDexApplication implements
protected AppPreferences preferences;

@Inject
protected DispatchingAndroidInjector<Activity> dispatchingActivityInjector;

@Inject
protected DispatchingAndroidInjector<Fragment> dispatchingFragmentInjector;

@Inject
protected DispatchingAndroidInjector<Service> dispatchingServiceInjector;

@Inject
protected DispatchingAndroidInjector<ContentProvider> dispatchingContentProviderInjector;

@Inject
protected DispatchingAndroidInjector<BroadcastReceiver> dispatchingBroadcastReceiverInjector;
protected DispatchingAndroidInjector<Object> dispatchingAndroidInjector;

@Inject
protected UserAccountManager accountManager;
Expand Down Expand Up @@ -732,27 +707,8 @@ private static void cleanOldEntries() {
}

@Override
public AndroidInjector<Activity> activityInjector() {
return dispatchingActivityInjector;
public AndroidInjector<Object> androidInjector() {
return dispatchingAndroidInjector;
}

@Override
public AndroidInjector<Fragment> supportFragmentInjector() {
return dispatchingFragmentInjector;
}

@Override
public AndroidInjector<Service> serviceInjector() {
return dispatchingServiceInjector;
}

@Override
public AndroidInjector<ContentProvider> contentProviderInjector() {
return dispatchingContentProviderInjector;
}

@Override
public AndroidInjector<BroadcastReceiver> broadcastReceiverInjector() {
return dispatchingBroadcastReceiverInjector;
}
}