mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-13 03:09:04 +01:00
Update Dagger modules.
This commit is contained in:
@@ -5,6 +5,7 @@ import org.briarproject.bramble.BrambleCoreModule;
|
||||
import org.briarproject.bramble.api.identity.IdentityManager;
|
||||
import org.briarproject.bramble.api.lifecycle.LifecycleManager;
|
||||
import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule;
|
||||
import org.briarproject.bramble.test.TestDnsModule;
|
||||
import org.briarproject.bramble.test.TestSocksModule;
|
||||
import org.briarproject.briar.api.blog.BlogManager;
|
||||
import org.briarproject.briar.api.feed.FeedManager;
|
||||
@@ -12,7 +13,6 @@ import org.briarproject.briar.avatar.AvatarModule;
|
||||
import org.briarproject.briar.blog.BlogModule;
|
||||
import org.briarproject.briar.client.BriarClientModule;
|
||||
import org.briarproject.briar.identity.IdentityModule;
|
||||
import org.briarproject.briar.test.TestDnsModule;
|
||||
|
||||
import javax.inject.Singleton;
|
||||
|
||||
@@ -28,7 +28,7 @@ import dagger.Component;
|
||||
FeedModule.class,
|
||||
IdentityModule.class,
|
||||
TestDnsModule.class,
|
||||
TestSocksModule.class,
|
||||
TestSocksModule.class
|
||||
})
|
||||
interface FeedManagerIntegrationTestComponent
|
||||
extends BrambleCoreIntegrationTestEagerSingletons {
|
||||
|
||||
@@ -2,6 +2,8 @@ package org.briarproject.briar.introduction;
|
||||
|
||||
import org.briarproject.bramble.BrambleCoreModule;
|
||||
import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule;
|
||||
import org.briarproject.bramble.test.TestDnsModule;
|
||||
import org.briarproject.bramble.test.TestSocksModule;
|
||||
import org.briarproject.briar.attachment.AttachmentModule;
|
||||
import org.briarproject.briar.autodelete.AutoDeleteModule;
|
||||
import org.briarproject.briar.avatar.AvatarModule;
|
||||
@@ -36,7 +38,9 @@ import dagger.Component;
|
||||
IntroductionModule.class,
|
||||
MessagingModule.class,
|
||||
PrivateGroupModule.class,
|
||||
SharingModule.class
|
||||
SharingModule.class,
|
||||
TestDnsModule.class,
|
||||
TestSocksModule.class
|
||||
})
|
||||
interface IntroductionIntegrationTestComponent
|
||||
extends BriarIntegrationTestComponent {
|
||||
|
||||
@@ -3,6 +3,8 @@ package org.briarproject.briar.messaging;
|
||||
import org.briarproject.bramble.BrambleCoreIntegrationTestEagerSingletons;
|
||||
import org.briarproject.bramble.BrambleCoreModule;
|
||||
import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule;
|
||||
import org.briarproject.bramble.test.TestDnsModule;
|
||||
import org.briarproject.bramble.test.TestSocksModule;
|
||||
import org.briarproject.briar.autodelete.AutoDeleteModule;
|
||||
import org.briarproject.briar.avatar.AvatarModule;
|
||||
import org.briarproject.briar.client.BriarClientModule;
|
||||
@@ -24,7 +26,9 @@ import dagger.Component;
|
||||
ConversationModule.class,
|
||||
ForumModule.class,
|
||||
IdentityModule.class,
|
||||
MessagingModule.class
|
||||
MessagingModule.class,
|
||||
TestDnsModule.class,
|
||||
TestSocksModule.class
|
||||
})
|
||||
interface MessageSizeIntegrationTestComponent
|
||||
extends BrambleCoreIntegrationTestEagerSingletons {
|
||||
|
||||
@@ -8,6 +8,8 @@ import org.briarproject.bramble.api.event.EventBus;
|
||||
import org.briarproject.bramble.api.identity.IdentityManager;
|
||||
import org.briarproject.bramble.api.lifecycle.LifecycleManager;
|
||||
import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule;
|
||||
import org.briarproject.bramble.test.TestDnsModule;
|
||||
import org.briarproject.bramble.test.TestSocksModule;
|
||||
import org.briarproject.briar.api.messaging.MessagingManager;
|
||||
import org.briarproject.briar.api.messaging.PrivateMessageFactory;
|
||||
import org.briarproject.briar.autodelete.AutoDeleteModule;
|
||||
@@ -25,7 +27,9 @@ import dagger.Component;
|
||||
BrambleCoreModule.class,
|
||||
BriarClientModule.class,
|
||||
ConversationModule.class,
|
||||
MessagingModule.class
|
||||
MessagingModule.class,
|
||||
TestDnsModule.class,
|
||||
TestSocksModule.class
|
||||
})
|
||||
interface SimplexMessagingIntegrationTestComponent
|
||||
extends BrambleCoreIntegrationTestEagerSingletons {
|
||||
|
||||
@@ -10,6 +10,8 @@ import org.briarproject.bramble.api.properties.TransportPropertyManager;
|
||||
import org.briarproject.bramble.api.system.Clock;
|
||||
import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule;
|
||||
import org.briarproject.bramble.test.BrambleIntegrationTestComponent;
|
||||
import org.briarproject.bramble.test.TestDnsModule;
|
||||
import org.briarproject.bramble.test.TestSocksModule;
|
||||
import org.briarproject.bramble.test.TimeTravel;
|
||||
import org.briarproject.briar.api.attachment.AttachmentReader;
|
||||
import org.briarproject.briar.api.autodelete.AutoDeleteManager;
|
||||
@@ -61,7 +63,9 @@ import dagger.Component;
|
||||
IntroductionModule.class,
|
||||
MessagingModule.class,
|
||||
PrivateGroupModule.class,
|
||||
SharingModule.class
|
||||
SharingModule.class,
|
||||
TestDnsModule.class,
|
||||
TestSocksModule.class
|
||||
})
|
||||
public interface BriarIntegrationTestComponent
|
||||
extends BrambleIntegrationTestComponent {
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
package org.briarproject.briar.test;
|
||||
|
||||
import dagger.Module;
|
||||
import dagger.Provides;
|
||||
import okhttp3.Dns;
|
||||
|
||||
@Module
|
||||
public class TestDnsModule {
|
||||
|
||||
@Provides
|
||||
Dns provideDns() {
|
||||
return Dns.SYSTEM;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user