Commit 52efbcac authored by akwizgran's avatar akwizgran

Merge branch '1360-rename-main-flavor' into 'master'

Rename main flavor due to internal conflicts

Closes #1360

See merge request !885
parents acf6a450 7ffcace2
......@@ -296,7 +296,7 @@ android {
minSdkVersion 18
applicationIdSuffix ".screenshot" // = org.briarproject.briar.android.screenshot.debug
}
main {
official {
dimension "version"
}
}
......
......@@ -4,7 +4,6 @@ import org.briarproject.bramble.BrambleAndroidModule;
import org.briarproject.bramble.BrambleCoreModule;
import org.briarproject.bramble.account.BriarAccountModule;
import org.briarproject.briar.BriarCoreModule;
import org.briarproject.briar.android.login.PasswordActivityTest;
import org.briarproject.briar.android.login.SetupActivityScreenshotTest;
import org.briarproject.briar.android.navdrawer.NavDrawerActivityTest;
import org.briarproject.briar.android.settings.SettingsActivityScreenshotTest;
......@@ -24,7 +23,6 @@ import dagger.Component;
public interface BriarUiTestComponent extends AndroidComponent {
void inject(SetupActivityScreenshotTest test);
void inject(PasswordActivityTest test);
void inject(NavDrawerActivityTest test);
void inject(SettingsActivityScreenshotTest test);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment