Merge branch '2-integrate_ipscrambling_module' into 'main'

2: integrate ipscrambling module in git repos and update dependencies

See merge request e/os/advanced-privacy!137

1 files changed, 7 insertions, 16 deletions

diff --git a/build.gradle b/build.gradle
index 7a0263e..0db901b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,28 +39,19 @@ buildscript {
     // Load properties either from local.properties or system environment (on CI).
     apply from: rootProject.file('load-properties.gradle')
 
-    // Load dependencies as extra properties.
-    apply from: rootProject.file('dependencies.gradle')
-
     repositories {
         google()
         mavenCentral()
     }
-
-    dependencies {
-        classpath Libs.androidGradlePlugin
-        classpath Libs.Kotlin.gradlePlugin
-        classpath Libs.AndroidX.navigation.safeArgs
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.12.4'
-    id 'com.github.ben-manes.versions' version '0.38.0'
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    alias libs.plugins.spotless
+    alias libs.plugins.benmanes.versions
+    alias libs.plugins.kotlin.android apply false
+    alias libs.plugins.android.application apply false
+    alias libs.plugins.kotlin.kapt apply false
+    alias libs.plugins.androidx.navigation.safeargs apply false
 }
 
 allprojects {
@@ -82,7 +73,7 @@ subprojects {
             targetExclude("$buildDir/**/*.kt")
             targetExclude('bin/**/*.kt')
             targetExclude '**/spotless/*.kt'
-            ktlint(Versions.ktlint)
+            ktlint("0.40.0")
         }
         format 'misc', {
             // define the files to apply `misc` to