Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '106-fix-package-name' into 'master'

Browse Source 
Set applicationId to match app_package

See merge request !560
This commit is contained in:
Torsten Grote
2017-07-05 13:46:30 +00:00
parent a879747968 5678f8aaa4
commit a711d6b8a1
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/build.gradle
View File

@@ -80,6 +80,7 @@ android {
targetSdkVersion 22 targetSdkVersion 22
versionCode 15 versionCode 15
versionName "0.15" versionName "0.15"
applicationId "org.briarproject.briar.beta"
resValue "string", "app_package", "org.briarproject.briar.beta" resValue "string", "app_package", "org.briarproject.briar.beta"
buildConfigField "String", "GitHash", "\"${getGitHash()}\"" buildConfigField "String", "GitHash", "\"${getGitHash()}\""
} }

3
briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java
View File

@@ -36,7 +36,8 @@ import static org.mockito.Mockito.verify;
@RunWith(RobolectricGradleTestRunner.class) @RunWith(RobolectricGradleTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 21, @Config(constants = BuildConfig.class, sdk = 21,
application = TestBriarApplication.class) application = TestBriarApplication.class,
packageName = "org.briarproject.briar")
public class ForumActivityTest { public class ForumActivityTest {
private final static String AUTHOR_1 = "Author 1"; private final static String AUTHOR_1 = "Author 1";

3
briar-android/src/test/java/org/briarproject/briar/android/login/ChangePasswordActivityTest.java
View File

@@ -41,7 +41,8 @@ import static org.mockito.Mockito.when;
@RunWith(RobolectricGradleTestRunner.class) @RunWith(RobolectricGradleTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 21, @Config(constants = BuildConfig.class, sdk = 21,
application = TestBriarApplication.class) application = TestBriarApplication.class,
packageName = "org.briarproject.briar")
public class ChangePasswordActivityTest { public class ChangePasswordActivityTest {
private static final int TIMEOUT_MS = 10 * 1000; private static final int TIMEOUT_MS = 10 * 1000;

3
briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java
View File

@@ -47,7 +47,8 @@ import static org.robolectric.Shadows.shadowOf;
@RunWith(RobolectricGradleTestRunner.class) @RunWith(RobolectricGradleTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 21, @Config(constants = BuildConfig.class, sdk = 21,
application = TestBriarApplication.class) application = TestBriarApplication.class,
packageName = "org.briarproject.briar")
public class SetupActivityTest { public class SetupActivityTest {
private static final int TIMEOUT_MS = 10 * 1000; private static final int TIMEOUT_MS = 10 * 1000;