From 95f0c8fb06bd1aa57702f56f2c736e9718597080 Mon Sep 17 00:00:00 2001 From: jacquarg Date: Mon, 8 Nov 2021 10:22:46 +0100 Subject: Use gitlab package registry instead of subprojects --- app/build.gradle | 10 ++--- build.gradle | 36 ++++++++++----- embeddedmavenrepository/.gitignore | 1 - .../e/orbotservice/16.4.1/orbotservice-16.4.1.aar | Bin 879628 -> 0 bytes .../e/orbotservice/16.4.1/orbotservice-16.4.1.pom | 50 --------------------- .../e/orbotservice/maven-metadata-local.xml | 13 ------ .../0.1.0/privacymodule.tor-0.1.0.aar | Bin 28552 -> 0 bytes .../0.1.0/privacymodule.tor-0.1.0.pom | 35 --------------- .../e/privacymodule.tor/maven-metadata-local.xml | 13 ------ privacymodulesapi/build.gradle | 2 - privacymodulesapi/privacymodulesapi-debug.aar | Bin 34149 -> 0 bytes privacymodulese/build.gradle | 3 -- privacymodulese/privacymodulese-debug.aar | Bin 16445 -> 0 bytes privacymodulesgoogle/build.gradle | 2 - .../privacymodulesgoogle-release.aar | Bin 45057 -> 0 bytes settings.gradle | 2 - 16 files changed, 31 insertions(+), 136 deletions(-) delete mode 100644 embeddedmavenrepository/.gitignore delete mode 100644 embeddedmavenrepository/foundation/e/orbotservice/16.4.1/orbotservice-16.4.1.aar delete mode 100644 embeddedmavenrepository/foundation/e/orbotservice/16.4.1/orbotservice-16.4.1.pom delete mode 100644 embeddedmavenrepository/foundation/e/orbotservice/maven-metadata-local.xml delete mode 100644 embeddedmavenrepository/foundation/e/privacymodule.tor/0.1.0/privacymodule.tor-0.1.0.aar delete mode 100644 embeddedmavenrepository/foundation/e/privacymodule.tor/0.1.0/privacymodule.tor-0.1.0.pom delete mode 100644 embeddedmavenrepository/foundation/e/privacymodule.tor/maven-metadata-local.xml delete mode 100644 privacymodulesapi/build.gradle delete mode 100644 privacymodulesapi/privacymodulesapi-debug.aar delete mode 100644 privacymodulese/build.gradle delete mode 100644 privacymodulese/privacymodulese-debug.aar delete mode 100644 privacymodulesgoogle/build.gradle delete mode 100644 privacymodulesgoogle/privacymodulesgoogle-release.aar diff --git a/app/build.gradle b/app/build.gradle index 63b197e..bc07919 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -95,15 +95,15 @@ dependencies { compileOnly files('libs/e-ui-sdk-1.0.1-q.jar') implementation files('libs/lineage-sdk.jar') implementation files('libs/trackerfilter.aar') - //implementation project(":privacymodulesapi") + // include the google specific version of the modules, just for the google flavor - googleImplementation project(":privacymodulesgoogle") + // TODO: google version is broken for now. googleImplementation project(":privacymodulesgoogle") // include the e specific version of the modules, just for the e flavor - eImplementation project(":privacymodulese") + eImplementation 'foundation.e:privacymodule.e-29:0.3.2' - implementation 'foundation.e:privacymodule.api:0.3.1' - implementation 'foundation.e:privacymodule.tor:0.1.0' + implementation 'foundation.e:privacymodule.api:0.3.2' + implementation 'foundation.e:privacymodule.tor:0.1.1' implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' diff --git a/build.gradle b/build.gradle index 63cdb08..f1ec9b7 100644 --- a/build.gradle +++ b/build.gradle @@ -56,7 +56,6 @@ allprojects { repositories { google() mavenCentral() - //mavenLocal() maven { url 'https://api.mapbox.com/downloads/v2/releases/maven' authentication { @@ -72,18 +71,35 @@ allprojects { } maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } maven { url 'https://jitpack.io' } - maven { - url "https://gitlab.e.foundation/api/v4/groups/13662/-/packages/maven" - name "GitLab" - credentials(HttpHeaderCredentials) { - name = 'Private-Token' - value = gitLabPrivateToken + + def ciJobToken = System.getenv("CI_JOB_TOKEN") + def ciApiV4Url = System.getenv("CI_API_V4_URL") + if (ciJobToken != null) { + maven { + url "${ciApiV4Url}/groups/13662/-/packages/maven" + name "GitLab" + credentials(HttpHeaderCredentials) { + name = 'Job-Token' + value = ciJobToken + } + authentication { + header(HttpHeaderAuthentication) + } } - authentication { - header(HttpHeaderAuthentication) + } else { + mavenLocal() + maven { + url "https://gitlab.e.foundation/api/v4/groups/13662/-/packages/maven" + name "GitLab" + credentials(HttpHeaderCredentials) { + name = 'Private-Token' + value = gitLabPrivateToken + } + authentication { + header(HttpHeaderAuthentication) + } } } - maven { url '../embeddedmavenrepository/'} } } diff --git a/embeddedmavenrepository/.gitignore b/embeddedmavenrepository/.gitignore deleted file mode 100644 index afa0879..0000000 --- a/embeddedmavenrepository/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!*.aar \ No newline at end of file diff --git a/embeddedmavenrepository/foundation/e/orbotservice/16.4.1/orbotservice-16.4.1.aar b/embeddedmavenrepository/foundation/e/orbotservice/16.4.1/orbotservice-16.4.1.aar deleted file mode 100644 index f8bd05b..0000000 Binary files a/embeddedmavenrepository/foundation/e/orbotservice/16.4.1/orbotservice-16.4.1.aar and /dev/null differ diff --git a/embeddedmavenrepository/foundation/e/orbotservice/16.4.1/orbotservice-16.4.1.pom b/embeddedmavenrepository/foundation/e/orbotservice/16.4.1/orbotservice-16.4.1.pom deleted file mode 100644 index 5736b70..0000000 --- a/embeddedmavenrepository/foundation/e/orbotservice/16.4.1/orbotservice-16.4.1.pom +++ /dev/null @@ -1,50 +0,0 @@ - - - 4.0.0 - foundation.e - orbotservice - 16.4.1 - aar - - - org.torproject - tor-android-binary - 0.4.4.6 - - - info.pluggabletransports.aptds - jsocksAndroid - 1.0.4 - - - com.jaredrummler - android-shell - 1.0.0 - - - androidx.core - core - 1.3.2 - - - androidx.localbroadcastmanager - localbroadcastmanager - 1.0.0 - - - com.offbynull.portmapper - portmapper - 2.0.5 - - - info.guardianproject - jtorctl - 0.4 - - - com.github.tladesignz - IPtProxy - 0.5.2 - - - diff --git a/embeddedmavenrepository/foundation/e/orbotservice/maven-metadata-local.xml b/embeddedmavenrepository/foundation/e/orbotservice/maven-metadata-local.xml deleted file mode 100644 index c2ae644..0000000 --- a/embeddedmavenrepository/foundation/e/orbotservice/maven-metadata-local.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - foundation.e - orbotservice - - 16.4.1 - 16.4.1 - - 16.4.1 - - 20210826064859 - - diff --git a/embeddedmavenrepository/foundation/e/privacymodule.tor/0.1.0/privacymodule.tor-0.1.0.aar b/embeddedmavenrepository/foundation/e/privacymodule.tor/0.1.0/privacymodule.tor-0.1.0.aar deleted file mode 100644 index b385feb..0000000 Binary files a/embeddedmavenrepository/foundation/e/privacymodule.tor/0.1.0/privacymodule.tor-0.1.0.aar and /dev/null differ diff --git a/embeddedmavenrepository/foundation/e/privacymodule.tor/0.1.0/privacymodule.tor-0.1.0.pom b/embeddedmavenrepository/foundation/e/privacymodule.tor/0.1.0/privacymodule.tor-0.1.0.pom deleted file mode 100644 index 8f96af5..0000000 --- a/embeddedmavenrepository/foundation/e/privacymodule.tor/0.1.0/privacymodule.tor-0.1.0.pom +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - foundation.e - privacymodule.tor - 0.1.0 - aar - - - org.jetbrains.kotlin - kotlin-stdlib - 1.4.10 - - - androidx.core - core-ktx - 1.6.0 - - - androidx.localbroadcastmanager - localbroadcastmanager - 1.0.0 - - - androidx.appcompat - appcompat - 1.2.0 - - - foundation.e - orbotservice - 16.4.1 - - - diff --git a/embeddedmavenrepository/foundation/e/privacymodule.tor/maven-metadata-local.xml b/embeddedmavenrepository/foundation/e/privacymodule.tor/maven-metadata-local.xml deleted file mode 100644 index 0b05fb4..0000000 --- a/embeddedmavenrepository/foundation/e/privacymodule.tor/maven-metadata-local.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - foundation.e - privacymodule.tor - - 0.1.0 - 0.1.0 - - 0.1.0 - - 20210830142258 - - diff --git a/privacymodulesapi/build.gradle b/privacymodulesapi/build.gradle deleted file mode 100644 index e9e42c9..0000000 --- a/privacymodulesapi/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('privacymodulesapi-debug.aar')) diff --git a/privacymodulesapi/privacymodulesapi-debug.aar b/privacymodulesapi/privacymodulesapi-debug.aar deleted file mode 100644 index 233eb30..0000000 Binary files a/privacymodulesapi/privacymodulesapi-debug.aar and /dev/null differ diff --git a/privacymodulese/build.gradle b/privacymodulese/build.gradle deleted file mode 100644 index 7eb2490..0000000 --- a/privacymodulese/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -configurations.maybeCreate("default") -//artifacts.add("default", file('privacymodulese-release.aar')) -artifacts.add("default", file('privacymodulese-debug.aar')) diff --git a/privacymodulese/privacymodulese-debug.aar b/privacymodulese/privacymodulese-debug.aar deleted file mode 100644 index 5107fc8..0000000 Binary files a/privacymodulese/privacymodulese-debug.aar and /dev/null differ diff --git a/privacymodulesgoogle/build.gradle b/privacymodulesgoogle/build.gradle deleted file mode 100644 index 845fe8f..0000000 --- a/privacymodulesgoogle/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('privacymodulesgoogle-release.aar')) diff --git a/privacymodulesgoogle/privacymodulesgoogle-release.aar b/privacymodulesgoogle/privacymodulesgoogle-release.aar deleted file mode 100644 index 22871cb..0000000 Binary files a/privacymodulesgoogle/privacymodulesgoogle-release.aar and /dev/null differ diff --git a/settings.gradle b/settings.gradle index e231e8e..dca731c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,3 @@ include ':flow-mvi' include ':app' -include ':privacymodulesgoogle' -include ':privacymodulese' rootProject.name = "PrivacyCentralApp" \ No newline at end of file -- cgit v1.2.1