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

Commit c615cb53 authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

Merge branch '000-move-dependencies-across-gradle-file' into 'main' 

move dependencies from build.gradle (top) to settings.gradle to follow same...

See merge request !133
parents c0596ecc 739a8910

README.md

+5 −4
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ To check for any codestyle related error, `./gradlew spotlessCheck`. Use `./grad 
### Setting up pre-commit hooks

To strictly enforce the code quality, this project has a pre-commit hook which is triggered everytime before you commit any changes (only applies to *.kt, *.gradle, *.md and *.gitignore). You must setup the pre-commit hook before doing any changes to the project. For that, this project has a script which can executed as follows:

```bash

hooks/pre-commit

./hooks/pre-commit

```



## Build dependencies
@@ -90,7 +90,6 @@ then run the build as usual 
This won't include advanced privacy, you still need to build the app.







This app requires different modules that must be built indivually and pushed to a local maven repository or our gitlab



modules must be build and deployed in the following order:
@@ -105,9 +104,11 @@ modules must be build and deployed in the following order: 
## Build

If you'd like to build AdvancedPrivacy locally, you should be able to just clone and build with no issues.



For building from CLI, you can execute this command:

For building from CLI, you can execute use `./gradlew assemble<Flavor><Debug|Release>` command:



Example for eOs debug version

```bash

./gradlew build

./gradlew assembleEDebug

```



## How to use AdvancedPrivacy apk

build.gradle

+0 −37
Original line number Diff line number Diff line
@@ -70,43 +70,6 @@ allprojects { 
            jvmTarget = "1.8"

        }

    }



    repositories {

        google()

        mavenCentral()

        maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }

        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven' }

        maven { url 'https://jitpack.io' }



        def ciJobToken = System.getenv("CI_JOB_TOKEN")

        def ciApiV4Url = System.getenv("CI_API_V4_URL")

        if (ciJobToken != null) {

            maven {

                url "${ciApiV4Url}/groups/9/-/packages/maven"

                name "GitLab"

                credentials(HttpHeaderCredentials) {

                    name = 'Job-Token'

                    value = ciJobToken

                }

                authentication {

                    header(HttpHeaderAuthentication)

                }

            }

        } else {

            mavenLocal()

            maven {

                url "https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven"

                name "GitLab"

                credentials(HttpHeaderCredentials) {

                    name = 'Private-Token'

                    value = gitLabPrivateToken

                }

                authentication {

                    header(HttpHeaderAuthentication)

                }

            }

        }

    }

}



subprojects {

settings.gradle

+20 −0
Original line number Diff line number Diff line 
pluginManagement {

    repositories {

        gradlePluginPortal()

        google()

        mavenCentral()

    }

}



include ':app'

rootProject.name = "AdvancedPrivacy"

include ':fakelocation'
@@ -7,3 +15,15 @@ include ':permissionsstandalone' 
include ':trackers'

include ':permissionse'

include ':permissionse:libs:hidden-apis-stub'





dependencyResolutionManagement {

    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)

    repositories {

        google()

        mavenCentral()

        maven { url "https://jitpack.io" }

        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}

        maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }

    }

}
 
 No newline at end of file