Use gitlab package registry instead of subprojects

16 files changed, 31 insertions, 136 deletions

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
--- a/embeddedmavenrepository/foundation/e/orbotservice/16.4.1/orbotservice-16.4.1.aar
+++ /dev/null
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>foundation.e</groupId>
-  <artifactId>orbotservice</artifactId>
-  <version>16.4.1</version>
-  <packaging>aar</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.torproject</groupId>
-      <artifactId>tor-android-binary</artifactId>
-      <version>0.4.4.6</version>
-    </dependency>
-    <dependency>
-      <groupId>info.pluggabletransports.aptds</groupId>
-      <artifactId>jsocksAndroid</artifactId>
-      <version>1.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>com.jaredrummler</groupId>
-      <artifactId>android-shell</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>androidx.core</groupId>
-      <artifactId>core</artifactId>
-      <version>1.3.2</version>
-    </dependency>
-    <dependency>
-      <groupId>androidx.localbroadcastmanager</groupId>
-      <artifactId>localbroadcastmanager</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.offbynull.portmapper</groupId>
-      <artifactId>portmapper</artifactId>
-      <version>2.0.5</version>
-    </dependency>
-    <dependency>
-      <groupId>info.guardianproject</groupId>
-      <artifactId>jtorctl</artifactId>
-      <version>0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>com.github.tladesignz</groupId>
-      <artifactId>IPtProxy</artifactId>
-      <version>0.5.2</version>
-    </dependency>
-  </dependencies>
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>foundation.e</groupId>
-  <artifactId>orbotservice</artifactId>
-  <versioning>
-    <latest>16.4.1</latest>
-    <release>16.4.1</release>
-    <versions>
-      <version>16.4.1</version>
-    </versions>
-    <lastUpdated>20210826064859</lastUpdated>
-  </versioning>
-</metadata>
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
--- a/embeddedmavenrepository/foundation/e/privacymodule.tor/0.1.0/privacymodule.tor-0.1.0.aar
+++ /dev/null
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>foundation.e</groupId>
-  <artifactId>privacymodule.tor</artifactId>
-  <version>0.1.0</version>
-  <packaging>aar</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib</artifactId>
-      <version>1.4.10</version>
-    </dependency>
-    <dependency>
-      <groupId>androidx.core</groupId>
-      <artifactId>core-ktx</artifactId>
-      <version>1.6.0</version>
-    </dependency>
-    <dependency>
-      <groupId>androidx.localbroadcastmanager</groupId>
-      <artifactId>localbroadcastmanager</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>androidx.appcompat</groupId>
-      <artifactId>appcompat</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>foundation.e</groupId>
-      <artifactId>orbotservice</artifactId>
-      <version>16.4.1</version>
-    </dependency>
-  </dependencies>
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>foundation.e</groupId>
-  <artifactId>privacymodule.tor</artifactId>
-  <versioning>
-    <latest>0.1.0</latest>
-    <release>0.1.0</release>
-    <versions>
-      <version>0.1.0</version>
-    </versions>
-    <lastUpdated>20210830142258</lastUpdated>
-  </versioning>
-</metadata>
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
--- a/privacymodulesapi/privacymodulesapi-debug.aar
+++ /dev/null
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
--- a/privacymodulese/privacymodulese-debug.aar
+++ /dev/null
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
--- a/privacymodulesgoogle/privacymodulesgoogle-release.aar
+++ /dev/null
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