mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-15 20:29:52 +01:00
Merge branch 'social-backup-poc-separate-namespace' into 'social-backup-poc'
Use different applicationId/app package See merge request briar/briar!1410
This commit is contained in:
@@ -24,7 +24,7 @@ android {
|
|||||||
targetSdkVersion 29
|
targetSdkVersion 29
|
||||||
versionCode 10216
|
versionCode 10216
|
||||||
versionName "1.2.16"
|
versionName "1.2.16"
|
||||||
applicationId "org.briarproject.briar.android"
|
applicationId "org.briarproject.briar.socialbackup"
|
||||||
|
|
||||||
vectorDrawables.useSupportLibrary = true
|
vectorDrawables.useSupportLibrary = true
|
||||||
buildConfigField "String", "GitHash",
|
buildConfigField "String", "GitHash",
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name" translatable="false">Briar Debug</string>
|
<string name="app_name" translatable="false">Briar SB Debug</string>
|
||||||
<string name="app_package" translatable="false">org.briarproject.briar.android.debug</string>
|
<string name="app_package" translatable="false">org.briarproject.briar.socialbackup.debug</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
|
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
|
||||||
|
|
||||||
<string name="app_name" translatable="false">Briar</string>
|
<string name="app_name" translatable="false">Briar SB</string>
|
||||||
<string name="app_package" translatable="false">org.briarproject.briar.android</string>
|
<string name="app_package" translatable="false">org.briarproject.briar.socialbackup</string>
|
||||||
|
|
||||||
<!-- Setup -->
|
<!-- Setup -->
|
||||||
<string name="setup_title">Welcome to Briar</string>
|
<string name="setup_title">Welcome to Briar</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user