2-Simplify sources modules tree

1 files changed, 52 insertions, 46 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 5f2b302..61ee623 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,10 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        manifestPlaceholders = [ persistent: "false" ]
+        manifestPlaceholders = [
+            persistent: "false",
+            mainActivityIntentFilterCategory: "android.intent.category.LAUNCHER"
+        ]
 
         resValue("string", "mapbox_key", MAPBOX_KEY)
     }
@@ -47,24 +50,36 @@ android {
             dimension 'os'
             minSdkVersion 29
             targetSdkVersion 29
+            signingConfig signingConfigs.eDebug
         }
         e30 {
             dimension 'os'
             minSdkVersion 30
             targetSdkVersion 30
+            signingConfig signingConfigs.eDebug
+        }
+        standalone {
+            dimension 'os'
+            applicationIdSuffix '.standalone'
+            minSdkVersion 26
+            targetSdkVersion 31
+            manifestPlaceholders = [
+                persistent: "false",
+                mainActivityIntentFilterCategory: "android.intent.category.LAUNCHER"
+            ]
+            signingConfig signingConfigs.debug
         }
-//        google {
-//            applicationIdSuffix '.google'
-//            dimension 'os'
-//        }
     }
 
     buildTypes {
         debug {
-            signingConfig null  // Set signing config to null as we use signingConfig per variant.
+            signingConfig null // Set signing config to null as we use signingConfig per variant.
         }
         release {
-            manifestPlaceholders = [ persistent: "true" ]
+            manifestPlaceholders = [
+                persistent: "true",
+                mainActivityIntentFilterCategory: "android.intent.category.INFO"
+            ]
 
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -78,13 +93,6 @@ android {
         variant.outputs.all { output ->
             outputFileName = "Advanced_Privacy-${variant.versionName}-${variant.getFlavorName()}-${variant.buildType.name}.apk"
         }
-        if (variant.buildType.name == "debug") {
-            if (variant.getFlavorName() == "e29" || variant.getFlavorName() == "e30") {
-                variant.mergedFlavor.signingConfig = signingConfigs.eDebug
-            } else {
-                variant.mergedFlavor.signingConfig = signingConfigs.debug
-            }
-        }
     }
 
     compileOptions {
@@ -103,53 +111,51 @@ android {
 }
 
 dependencies {
+    implementation project(':api')
 
-    compileOnly files('libs/e-ui-sdk-1.0.1-q.jar')
-    implementation files('libs/lineage-sdk.jar')
-    // include the google specific version of the modules, just for the google flavor
-    //googleImplementation project(":privacymodulesgoogle")
-    // include the e specific version of the modules, just for the e flavor
-
-    implementation 'foundation.e:privacymodule.trackerfilter:0.7.0'
-    implementation 'foundation.e:privacymodule.api:1.1.0'
-    e29Implementation 'foundation.e:privacymodule.e-29:0.4.3'
-    e30Implementation 'foundation.e:privacymodule.e-30:0.4.3'
-    implementation 'foundation.e:privacymodule.tor:0.2.4'
-
+    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'
+    }
 
-    //    implementation Libs.Kotlin.stdlib
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$Versions.kotlin"
-//    implementation Libs.AndroidX.coreKtx
-    implementation "androidx.core:core-ktx:1.8.0"
-
-//    implementation Libs.AndroidX.Fragment.fragmentKtx
-    implementation "androidx.fragment:fragment-ktx:$Versions.fragment"
+    implementation project(':fakelocation')
 
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-//    implementation Libs.AndroidX.Lifecycle.runtime
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$Versions.lifecycle"
-//    implementation Libs.AndroidX.Lifecycle.viewmodel
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$Versions.lifecycle"
+    e29CompileOnly files('libs/e-ui-sdk-1.0.1-q.jar')
+    e29Implementation files('libs/lineage-sdk.jar')
 
-    implementation 'androidx.work:work-runtime-ktx:2.7.1'
+    e30CompileOnly files('libs/e-ui-sdk-1.0.1-q.jar')
+    e30Implementation files('libs/lineage-sdk.jar')
 
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation project(':trackers')
 
+    implementation 'foundation.e:privacymodule.tor:0.2.4'
 
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-scalars:2.9.0'
+    implementation (
+        Libs.Kotlin.stdlib,
+        Libs.AndroidX.coreKtx,
+        Libs.AndroidX.appCompat,
+        Libs.AndroidX.Fragment.fragmentKtx,
+        Libs.AndroidX.Lifecycle.runtime,
+        Libs.AndroidX.Lifecycle.viewmodel,
+        Libs.AndroidX.work,
+        Libs.material,
 
-//    implementation Libs.MapBox.sdk
-    implementation "com.mapbox.mapboxsdk:mapbox-android-sdk:$Versions.mapbox"
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
+        Libs.Retrofit.retrofit,
+        Libs.Retrofit.scalars,
 
+        Libs.MapBox.sdk,
+        Libs.mpAndroidCharts
+    )
 
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 }
 
 static def log(Object val) {