Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f47f1e9 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '319-main-naming_scheme' into 'main' 

privacycentralapp: Change app naming scheme

See merge request e/privacy-central/privacycentralapp!60
parents be84b603 708b8c67

app/build.gradle

+4 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ android { 
        minSdkVersion buildConfig.minSdk

        targetSdkVersion buildConfig.targetSdk

        versionCode buildConfig.version.code

        versionName buildConfig.version.fullName

        versionName buildConfig.version.name



        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -75,10 +75,10 @@ android { 
     * Sets the output name of the variant outputs and also it setup signingConfig based on the product flavor.

     */

    applicationVariants.all { variant ->

        if (variant.buildType.name == "debug") {

        variant.outputs.all { output ->

                outputFileName = "PrivacyCentral-${output.name}-${variant.versionName}.apk"

            outputFileName = "Advanced_Privacy-${variant.versionName}-${variant.getFlavorName()}.apk"

        }

        if (variant.buildType.name == "debug") {

            if (variant.getFlavorName() == "e29" || variant.getFlavorName() == "e30") {

                variant.mergedFlavor.signingConfig = signingConfigs.eDebug

            } else {

build.gradle

+1 −10
Original line number Diff line number Diff line
@@ -11,21 +11,12 @@ buildscript { 
            'major': 1,

            'minor': 0,

            'patch': 0,

            'build': "RC-1",

        ],

    ]



    ext.buildConfig.version['name'] = "${buildConfig.version.major}.${buildConfig.version.minor}.${buildConfig.version.patch}"

    ext.buildConfig.version['fullName'] = "${buildConfig.version.name}-${buildConfig.version.build}"

    def buildNumber

    if (buildConfig.version.build == 'alpha') {

        buildNumber = -2

    } else if (buildConfig.version.build == 'beta') {

        buildNumber = -1

    } else {

        buildNumber = 0

    }

    ext.buildConfig.version['code'] = buildConfig.version.major * 1000000 + buildConfig.version.minor * 10000 + buildConfig.version.patch * 100 + buildNumber

    ext.buildConfig.version['code'] = buildConfig.version.major * 1000000 + buildConfig.version.minor * 1000 + buildConfig.version.patch



    // Load properties either from local.properties or system environment (on CI).

    apply from: rootProject.file('load-properties.gradle')