diff options
author | Vincent Bourgmayer <vincent.bourgmayer@e.email> | 2023-05-11 12:45:57 +0000 |
---|---|---|
committer | Vincent Bourgmayer <vincent.bourgmayer@e.email> | 2023-05-11 12:45:57 +0000 |
commit | c615cb53ef58af2835796286c2f41bc41572dfbe (patch) | |
tree | c3180713b71fe21c088b9d57ad4e785fce35828a | |
parent | c0596ecc6236594d7a008219e978c9220984176b (diff) | |
parent | 739a89101d632d0f6633cf7d4eaf911768216c93 (diff) |
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 e/os/advanced-privacy!133
-rw-r--r-- | README.md | 9 | ||||
-rw-r--r-- | build.gradle | 37 | ||||
-rw-r--r-- | settings.gradle | 20 |
3 files changed, 25 insertions, 41 deletions
@@ -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 diff --git a/build.gradle b/build.gradle index f8e44e0..d88492d 100644 --- a/build.gradle +++ b/build.gradle @@ -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 { diff --git a/settings.gradle b/settings.gradle index 725f5c1..24ddbbd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,11 @@ +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 |