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

Commit 8884e042 authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

Merge branch '2-change_api_artifactid' into 'main'

2-Change artifactId for api module, to help cohabitation with permissions module.

See merge request !81
parents 1b9c519e d7a1777a
Loading
Loading
Loading
Loading
Loading
+8 −6
Original line number Diff line number Diff line
@@ -95,11 +95,13 @@ This app requires different modules that must be built indivually and pushed to

modules must be build and deployed in the following order:

- [privacymodulesapi](../../../e_privacycentral_privacymodulesapi)
- [privacymodulese](../../../e_privacycentral_privacymodulese)
- [privacymoduletor](../../../e_privacycentral_privacymoduletor)
- [privacymoduletrackerfilter](../../../e_privacycentral_privacymoduletrackerfilter)

- privacymodule-api : 
  - ./gradlew :privacymodule-api:assembleRelease
  - ./gradlew --console=verbose publishToMavenLocal // To make it available locally for dev.
  - ./gradlew --console=verbose publish // To publish it on gitlab for release.
- [privacymodule-e](../../../e_privacycentral_privacymodulese)
- [privacymodule-tor](../../../e_privacycentral_privacymoduletor)
- [app]

## Build
If you'd like to build PrivacyCentral locally, you should be able to just clone and build with no issues.
@@ -147,7 +149,7 @@ PrivacyCentral needs to be installed as system app and whitelisting in order to
### To run apk on stock android devices
You can simply install the apk. Keep in that mind all features won't be available on stock android devices.

> Volla!!!, PrivacyCentral is installed successfully in your device.
> Voila !!!, PrivacyCentral is installed successfully in your device.

# Distribution
This project can be distributed as prebuilt apk with /e/OS or it can be published on other app stores for non /e/OS devices.
+20 −9
Original line number Diff line number Diff line
/*
 * Copyright (C) 2022 E FOUNDATION
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

plugins {
    id 'com.android.application'
    id 'kotlin-android'
@@ -111,17 +128,11 @@ android {
}

dependencies {
    implementation project(':api')

    implementation project(':privacymodule-api')
    standaloneImplementation project(':permissionsstandalone')

    e29Implementation('foundation.e:privacymodule.e-29:1.2.0') {
        exclude group: 'foundation.e', module: 'privacymodule.api'
    }
    e30Implementation('foundation.e:privacymodule.e-30:1.2.0') {
        exclude group: 'foundation.e', module: 'privacymodule.api'
    }

    e29Implementation 'foundation.e:privacymodule-e-29:1.2.0'
    e30Implementation 'foundation.e:privacymodule-e-30:1.2.0'
    implementation project(':fakelocation')

    e29CompileOnly files('libs/e-ui-sdk-1.0.1-q.jar')
+17 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2022 E FOUNDATION
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

import foundation.e.privacycentral.buildsrc.DependencyUpdates
import foundation.e.privacycentral.buildsrc.ReleaseType

+17 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2022 E FOUNDATION
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

def libs = [:]
ext.Libs = libs

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ android {
}

dependencies {
    implementation project(':api')
    implementation project(':privacymodule-api')
    implementation project(':fakelocation')
    implementation project(':permissionsstandalone')

Loading