From 4b349cb762ab9181fbf49164326e7f03515c1681 Mon Sep 17 00:00:00 2001
From: Rowdy Mitchell Chotkan <rowdy_chotkan@msn.com>
Date: Mon, 26 Feb 2024 13:10:09 +0100
Subject: [PATCH] Remove unused dependencies + import transitive dependencies

---
 app/build.gradle                              | 40 ++++++----
 common-bitcoin/build.gradle                   | 12 +--
 common-ethereum/build.gradle                  | 26 ++++---
 common/build.gradle                           | 31 ++++----
 currencyii/build.gradle                       | 45 ++++++-----
 debug/build.gradle                            | 34 +++------
 eurotoken/build.gradle                        | 24 +++---
 freedomOfComputing/build.gradle               | 17 ++++-
 musicdao-datafeeder/build.gradle              | 10 ++-
 musicdao/build.gradle                         | 76 +++++++++++--------
 peerai/build.gradle                           | 14 +---
 .../trustchain/peerai/PeerAIActivity.kt       | 17 +----
 valuetransfer/build.gradle                    | 38 +++++++---
 13 files changed, 212 insertions(+), 172 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7362f7afd..f8fbd0d63 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -129,8 +129,6 @@ dependencies {
         exclude group: 'net.java.dev.jna'
     }
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc'
-
     // AndroidX
     implementation "androidx.datastore:datastore-preferences:1.0.0"
     implementation 'androidx.appcompat:appcompat:1.5.1'
@@ -138,14 +136,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
-    implementation "androidx.fragment:fragment-ktx:$fragment_version"
-    implementation "androidx.preference:preference-ktx:1.2.0"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-    implementation "androidx.work:work-runtime-ktx:2.7.1"
 
     // Firebase
     implementation 'com.google.firebase:firebase-analytics:21.2.0'
@@ -161,9 +152,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
     // Logging
-    implementation 'io.github.microutils:kotlin-logging:1.7.7'
     implementation('net.java.dev.jna:jna:5.12.1@aar')
-    implementation('com.github.tony19:logback-android:2.0.0')
 
     implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
     implementation project(':currencyii')
@@ -171,19 +160,40 @@ dependencies {
     // Testing
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     // Hilt
     implementation("com.google.dagger:hilt-android:$hilt_ver")
-    implementation("androidx.hilt:hilt-navigation-fragment:1.0.0")
-    implementation("androidx.hilt:hilt-navigation-compose:1.1.0-alpha01")
     kapt("com.google.dagger:hilt-android-compiler:$hilt_ver")
 
     // Room
     implementation "androidx.room:room-runtime:$room_version"
-    implementation("androidx.room:room-ktx:$room_version")
     annotationProcessor "androidx.room:room-compiler:$room_version"
     kapt("androidx.room:room-compiler:$room_version")
+
+    // Transitive dependencies
+    androidTestImplementation 'androidx.test:monitor:1.6.1'
+    implementation 'androidx.annotation:annotation:1.5.0'
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation 'androidx.core:core:1.9.0'
+    implementation 'androidx.datastore:datastore-core:1.0.0'
+    implementation 'androidx.datastore:datastore-preferences-core:1.0.0'
+    implementation 'androidx.fragment:fragment:1.5.4'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.0-alpha05'
+    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.sqlite:sqlite:2.4.0'
+    implementation 'app.cash.sqldelight:android-driver:2.0.1'
+    implementation 'app.cash.sqldelight:runtime:2.0.1'
+    implementation 'com.google.dagger:dagger:2.50'
+    implementation 'com.google.dagger:hilt-core:2.50'
+    implementation 'com.google.errorprone:error_prone_annotations:2.9.0'
+    implementation 'com.google.guava:guava:31.0.1-android'
+    implementation 'javax.inject:javax.inject:1'
+    implementation(project(':ipv8')) {
+        exclude module: 'lazysodium-java'
+    }
+    implementation project(':ipv8-android')
+    kapt 'com.google.dagger:dagger-compiler:2.50'
 }
 
 
diff --git a/common-bitcoin/build.gradle b/common-bitcoin/build.gradle
index 92ed14c58..ab2a3ee90 100644
--- a/common-bitcoin/build.gradle
+++ b/common-bitcoin/build.gradle
@@ -41,16 +41,8 @@ android {
 }
 
 dependencies {
-
-    api project(':common')
-
     api group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.15.10'
 
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
-
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    // Transitive dependency.
+    implementation 'com.google.guava:guava:30.0-android'
 }
diff --git a/common-ethereum/build.gradle b/common-ethereum/build.gradle
index af09a5029..8e4618f36 100644
--- a/common-ethereum/build.gradle
+++ b/common-ethereum/build.gradle
@@ -54,20 +54,28 @@ android {
 }
 
 dependencies {
-
-    api project(':common')
-
     api(group: 'org.web3j', name: 'core', version: '4.6.0-android') {
         exclude group: 'org.bouncycastle'
     }
 
     api project(':geth-android')
 
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
-
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+    // Transitive dependencies.
+    api 'io.reactivex.rxjava2:rxjava:2.2.2'
+    api('org.web3j:abi:4.6.0-android') {
+        exclude group: 'org.bouncycastle'
+    }
+    api('org.web3j:crypto:4.6.0-android') {
+        exclude group: 'org.bouncycastle'
+    }
+    implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0'
+    implementation('org.web3j:tuples:4.6.0-android') {
+        exclude group: 'org.bouncycastle'
+    }
+    implementation('org.web3j:utils:4.6.0-android') {
+        exclude group: 'org.bouncycastle'
+    }
 }
diff --git a/common/build.gradle b/common/build.gradle
index f0c853c02..4b6bfdcff 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -89,15 +89,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
-    implementation "androidx.fragment:fragment-ktx:${fragment_version}"
-    implementation "androidx.preference:preference:1.1.0"
-    implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation 'androidx.databinding:viewbinding:8.2.2'
 
     // QR
@@ -112,13 +105,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
-    // Logging
-    implementation 'io.github.microutils:kotlin-logging:1.7.7'
-
-    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
-
     implementation group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.15.10'
-
     api project(':geth-android')
 
     // BitTorrent
@@ -138,6 +125,24 @@ dependencies {
     testImplementation "app.cash.sqldelight:sqlite-driver:$sqldelight_version"
     testImplementation "com.goterl:lazysodium-java:5.1.4"
     annotationProcessor "androidx.room:room-compiler:$room_version"
+
+    // Transitive dependencies
+    api 'androidx.fragment:fragment:1.5.4'
+    api 'androidx.navigation:navigation-ui:2.5.3'
+    api 'androidx.viewpager2:viewpager2:1.0.0'
+    api(project(':ipv8')) {
+        exclude module: 'lazysodium-java'
+    }
+    implementation 'androidx.core:core:1.9.0'
+    implementation 'androidx.customview:customview:1.1.0'
+    implementation 'androidx.lifecycle:lifecycle-common:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-core:2.5.1'
+    implementation 'androidx.navigation:navigation-runtime:2.5.3'
+    implementation 'androidx.sqlite:sqlite:2.4.0'
+    implementation 'app.cash.sqldelight:android-driver:2.0.1'
+    implementation 'app.cash.sqldelight:coroutines-extensions:2.0.1'
+    implementation 'com.google.zxing:core:3.4.1'
+    testImplementation 'io.mockk:mockk-dsl:1.13.9'
 }
 
 
diff --git a/currencyii/build.gradle b/currencyii/build.gradle
index de354b0cc..6ab37b2bf 100644
--- a/currencyii/build.gradle
+++ b/currencyii/build.gradle
@@ -59,14 +59,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation "androidx.recyclerview:recyclerview:1.1.0"
-    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
-    implementation "androidx.fragment:fragment-ktx:$fragment_version"
-    implementation "androidx.preference:preference:1.1.0"
-    implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // Material
     implementation 'com.google.android.material:material:1.1.0'
@@ -76,31 +69,43 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation 'androidx.preference:preference:1.1.1'
-
-    // Logging
-    implementation 'io.github.microutils:kotlin-logging:1.7.7'
-
-    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
 
     // Testing
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
     testImplementation "io.mockk:mockk:$mockk_version"
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     // BitcoinJ
     implementation 'org.bitcoinj:bitcoinj-core:0.15.10'
 
-    // Google Core
-//    implementation "com.google.guava:guava:28.2-android"
-
     // GSON
     implementation 'com.google.code.gson:gson:2.8.6'
 
-    // HTTP requests
-    implementation 'com.android.volley:volley:1.2.0'
+    // Transitive dependencies
+    androidTestImplementation 'androidx.test:monitor:1.6.1'
+    androidTestImplementation 'junit:junit:4.13.2'
+    api 'androidx.fragment:fragment:1.5.4'
+    api 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1'
+    api 'androidx.navigation:navigation-common:2.5.3'
+    api 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
+    api 'com.google.code.findbugs:jsr305:3.0.2'
+    api 'org.bouncycastle:bcprov-jdk15to18:1.68'
+    api(project(':ipv8')) {
+        exclude module: 'lazysodium-java'
+    }
+    implementation 'androidx.core:core:1.9.0'
+    implementation 'androidx.customview:customview:1.1.0'
+    implementation 'androidx.lifecycle:lifecycle-common:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-core:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.navigation:navigation-fragment:2.5.3'
+    implementation 'androidx.navigation:navigation-runtime:2.5.3'
+    implementation 'androidx.navigation:navigation-ui:2.5.3'
+    implementation 'androidx.viewpager2:viewpager2:1.0.0'
+    implementation 'com.google.guava:guava:30.0-android'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
+
 
 }
 
diff --git a/debug/build.gradle b/debug/build.gradle
index 915460931..1fbc0327f 100644
--- a/debug/build.gradle
+++ b/debug/build.gradle
@@ -46,21 +46,8 @@ dependencies {
     implementation project(':common')
 
     // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
-    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
-    implementation "androidx.fragment:fragment-ktx:$fragment_version"
-    implementation "androidx.preference:preference:1.1.0"
-    implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-
-    // Material
-    implementation 'com.google.android.material:material:1.1.0'
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
@@ -68,20 +55,23 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
-    // Logging
-    implementation 'io.github.microutils:kotlin-logging:1.7.7'
-    implementation 'com.github.tony19:logback-android:2.0.0'
-
-    implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
-
     // Testing
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+    // Transitive dependencies
+    implementation 'androidx.core:core:1.9.0'
+    implementation 'androidx.fragment:fragment:1.5.4'
+    implementation 'androidx.lifecycle:lifecycle-common:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.navigation:navigation-fragment:2.5.3'
+    implementation 'androidx.navigation:navigation-runtime:2.5.3'
+    implementation(project(':ipv8')) {
+        exclude module: 'lazysodium-java'
+    }
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions.freeCompilerArgs += [
-        "-opt-in=kotlin.RequiresOptIn"
+            "-opt-in=kotlin.RequiresOptIn"
     ]
 }
diff --git a/eurotoken/build.gradle b/eurotoken/build.gradle
index 02588ddd8..de9d8c50d 100644
--- a/eurotoken/build.gradle
+++ b/eurotoken/build.gradle
@@ -55,27 +55,18 @@ dependencies {
     implementation project(':common')
 
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation "androidx.room:room-runtime:$room_version"
 
-    implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
 
     // Material
     implementation 'com.google.android.material:material:1.1.0'
-    implementation 'com.getbase:floatingactionbutton:1.10.1'
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
@@ -92,4 +83,19 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     annotationProcessor "androidx.room:room-compiler:$room_version"
 
+    // Transitive dependencies
+    androidTestImplementation 'androidx.test:monitor:1.6.1'
+    api(project(':ipv8')) {
+        exclude module: 'lazysodium-java'
+    }
+    implementation 'androidx.core:core:1.9.0'
+    implementation 'androidx.fragment:fragment:1.5.4'
+    implementation 'androidx.lifecycle:lifecycle-common:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-core:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.navigation:navigation-fragment:2.5.3'
+    implementation 'androidx.navigation:navigation-runtime:2.5.3'
+    implementation 'androidx.sqlite:sqlite:2.4.0'
+    implementation 'app.cash.sqldelight:android-driver:2.0.1'
+
 }
diff --git a/freedomOfComputing/build.gradle b/freedomOfComputing/build.gradle
index d9f4158ca..24cbf935e 100644
--- a/freedomOfComputing/build.gradle
+++ b/freedomOfComputing/build.gradle
@@ -56,7 +56,6 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'io.github.microutils:kotlin-logging:1.7.7'
@@ -65,16 +64,26 @@ dependencies {
     testImplementation group: 'org.awaitility', name: 'awaitility', version: '3.0.0'
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation project(':common')
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.2.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.2.1'
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+
+    // Transitive dependencies
+    androidTestImplementation 'androidx.test:monitor:1.6.1'
+    androidTestImplementation 'junit:junit:4.13.2'
+    api 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    api(project(':ipv8')) {
+        exclude module: 'lazysodium-java'
+    }
+    implementation 'androidx.core:core:1.9.0'
+    implementation 'androidx.fragment:fragment:1.5.4'
+    implementation 'androidx.transition:transition:1.4.1'
+    implementation project(':ipv8-android')
+    testImplementation 'io.mockk:mockk-dsl:1.13.9'
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
diff --git a/musicdao-datafeeder/build.gradle b/musicdao-datafeeder/build.gradle
index 3d586225d..68b80bdd7 100644
--- a/musicdao-datafeeder/build.gradle
+++ b/musicdao-datafeeder/build.gradle
@@ -17,11 +17,15 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation "app.cash.sqldelight:sqlite-driver:$sqldelight_version"
     implementation 'com.mpatric:mp3agic:0.9.1'
-    implementation 'com.turn:ttorrent-core:1.5'
-    implementation "app.cash.sqldelight:coroutines-extensions:$sqldelight_version"
     implementation 'org.bitcoinj:bitcoinj-core:0.15.10'
 
     implementation files('../common/libs/jlibtorrent-' + jlibtorrent_version + '.jar')
+
+    // Transitive dependencies
+    implementation 'app.cash.sqldelight:runtime:2.0.1'
+    implementation(project(':ipv8')) {
+        exclude module: 'lazysodium-java'
+    }
 }
 
 application {
@@ -30,6 +34,6 @@ application {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions.freeCompilerArgs += [
-        "-opt-in=kotlin.ExperimentalUnsignedTypes",
+            "-opt-in=kotlin.ExperimentalUnsignedTypes",
     ]
 }
diff --git a/musicdao/build.gradle b/musicdao/build.gradle
index 811b06078..1d89bed5c 100644
--- a/musicdao/build.gradle
+++ b/musicdao/build.gradle
@@ -92,51 +92,24 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.3'
-    implementation 'com.google.android:flexbox:2.0.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc'
 
     // BitTorrent/Libtorrent libraries
     implementation 'com.turn:ttorrent-core:1.5'
 
     implementation 'com.google.android.exoplayer:exoplayer-core:2.17.1'
-    implementation 'com.google.android.exoplayer:exoplayer-dash:2.17.1'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.17.1'
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.17.1'
 
     // Cryptocurrency integration
     implementation 'org.bitcoinj:bitcoinj-core:0.15.10'
-//    implementation 'com.google.guava:guava:29.0-android'
-    //implementation 'org.knowm.xchange:xchange-parent:5.0.1'
-    //implementation 'org.knowm.xchange:xchange-binance:5.0.1'
-
-    // Crypto library for testing
-    testImplementation "com.goterl:lazysodium-java:5.1.4"
 
     // Testing
-    testImplementation 'junit:junit:4.12'
     testImplementation "io.mockk:mockk:$mockk_version"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
-    testImplementation "org.robolectric:robolectric:3.4.2"
-
-    // Testing and generating example data
-    implementation "app.cash.sqldelight:sqlite-driver:$sqldelight_version"
 
     // Reading MP3 metadata
     implementation 'com.mpatric:mp3agic:0.9.1'
 
-    // Logging
-    implementation 'io.github.microutils:kotlin-logging:1.7.7'
-
     // Integration with activities
     implementation 'androidx.activity:activity-compose:1.3.1'
     // Compose Material Design
@@ -147,9 +120,7 @@ dependencies {
     implementation 'androidx.compose.ui:ui-tooling:1.0.1'
     // Integration with ViewModels
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07'
-    // UI Tests
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.0.1'
-    // Compose
+
     // Runtime
     implementation "androidx.compose.runtime:runtime-livedata:1.0.1"
 
@@ -164,7 +135,6 @@ dependencies {
 
     // Hilt
     implementation("com.google.dagger:hilt-android:$hilt_ver")
-    implementation("androidx.hilt:hilt-navigation-fragment:1.0.0-alpha03")
     implementation("androidx.hilt:hilt-navigation-compose:1.0.0-alpha03")
     kapt("com.google.dagger:hilt-android-compiler:$hilt_ver")
 
@@ -173,6 +143,50 @@ dependencies {
     implementation("org.apache.commons:commons-csv:1.9.0")
     implementation "org.jetbrains.kotlin:kotlin-reflect:1.9.22"
 
+    // Transitive dependencies
+    api 'androidx.compose.foundation:foundation-layout:1.4.0-alpha05'
+    api 'androidx.compose.foundation:foundation:1.4.0-alpha05'
+    api 'androidx.compose.runtime:runtime:1.4.0-alpha05'
+    api 'androidx.compose.ui:ui-graphics:1.4.0-alpha05'
+    api 'androidx.compose.ui:ui:1.4.0-alpha05'
+    api 'androidx.lifecycle:lifecycle-livedata-core:2.6.0-alpha05'
+    api 'androidx.lifecycle:lifecycle-viewmodel:2.6.0-alpha05'
+    api 'androidx.navigation:navigation-common:2.5.3'
+    api 'androidx.navigation:navigation-runtime:2.5.3'
+    api 'com.google.code.findbugs:jsr305:3.0.2'
+    api 'com.google.dagger:dagger:2.50'
+    api 'com.google.dagger:hilt-core:2.50'
+    api 'javax.inject:javax.inject:1'
+    api 'org.bouncycastle:bcprov-jdk15to18:1.68'
+    api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0'
+    api(project(':ipv8')) {
+        exclude module: 'lazysodium-java'
+    }
+    implementation 'androidx.activity:activity:1.5.1'
+    implementation 'androidx.annotation:annotation:1.5.0'
+    implementation 'androidx.compose.animation:animation-core:1.4.0-alpha05'
+    implementation 'androidx.compose.material:material-icons-core:1.4.0-alpha05'
+    implementation 'androidx.compose.runtime:runtime-saveable:1.4.0-alpha05'
+    implementation 'androidx.compose.ui:ui-text:1.4.0-alpha05'
+    implementation 'androidx.compose.ui:ui-unit:1.4.0-alpha05'
+    implementation 'androidx.core:core:1.9.0'
+    implementation 'androidx.fragment:fragment:1.5.4'
+    implementation 'androidx.lifecycle:lifecycle-common:2.6.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.6.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-runtime:2.6.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0-alpha05'
+    implementation 'androidx.navigation:navigation-compose:2.5.3'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.room:room-common:2.6.1'
+    implementation 'androidx.sqlite:sqlite:2.4.0'
+    implementation 'com.google.android.exoplayer:exoplayer-common:2.17.1'
+    implementation 'com.google.android.exoplayer:exoplayer-datasource:2.17.1'
+    implementation 'com.google.guava:guava:31.0.1-android'
+    implementation 'commons-io:commons-io:2.4'
+    kapt 'com.google.dagger:dagger-compiler:2.50'
 }
 
 repositories {
diff --git a/peerai/build.gradle b/peerai/build.gradle
index 6adafce30..c9a3c0ccb 100644
--- a/peerai/build.gradle
+++ b/peerai/build.gradle
@@ -40,28 +40,20 @@ android {
 }
 
 dependencies {
-    // Other classpath declarations
     implementation project(':common')
     api project(':common')
 
-    implementation 'org.apache.commons:commons-text:1.9'
     implementation 'com.google.code.gson:gson:2.8.8'
-    // ML
-
-    implementation 'com.github.haifengl:smile-kotlin:3.0.1'
-
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     implementation 'com.squareup.picasso:picasso:2.8'
 
+    // Transitive dependencies
+    androidTestImplementation 'androidx.test:monitor:1.6.1'
+    androidTestImplementation 'junit:junit:4.13.2'
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
diff --git a/peerai/src/main/java/nl/tudelft/trustchain/peerai/PeerAIActivity.kt b/peerai/src/main/java/nl/tudelft/trustchain/peerai/PeerAIActivity.kt
index dbb774e30..873ab4b63 100644
--- a/peerai/src/main/java/nl/tudelft/trustchain/peerai/PeerAIActivity.kt
+++ b/peerai/src/main/java/nl/tudelft/trustchain/peerai/PeerAIActivity.kt
@@ -1,20 +1,7 @@
 package nl.tudelft.trustchain.peerai
 
-
-import android.os.Bundle
-import android.widget.*
 import nl.tudelft.trustchain.common.BaseActivity
-import smile.nlp.bag
-import smile.nlp.normalize
-import smile.nlp.words
-
-
-open  class PeerAIActivity : BaseActivity() {
-
-    override val navigationGraph = R.navigation.nav_peerai;
-
-
-
-
 
+open class PeerAIActivity : BaseActivity() {
+    override val navigationGraph = R.navigation.nav_peerai
 }
diff --git a/valuetransfer/build.gradle b/valuetransfer/build.gradle
index b0734edf3..6e58b9c26 100644
--- a/valuetransfer/build.gradle
+++ b/valuetransfer/build.gradle
@@ -72,10 +72,6 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation "androidx.recyclerview:recyclerview:1.1.0"
-    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
-    implementation "androidx.fragment:fragment-ktx:$fragment_version"
-    implementation "androidx.preference:preference:1.1.0"
     implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
@@ -83,7 +79,6 @@ dependencies {
 
     // Material
     implementation 'com.google.android.material:material:1.2.0'
-    implementation 'com.getbase:floatingactionbutton:1.10.1'
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
@@ -93,12 +88,9 @@ dependencies {
 
     // Logging
     implementation 'io.github.microutils:kotlin-logging:1.7.7'
-    implementation 'com.github.tony19:logback-android:2.0.0'
 
     implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation "androidx.room:room-runtime:$room_version"
     implementation project(path: ':eurotoken')
     implementation 'com.google.android.gms:play-services-maps:18.2.0'
@@ -108,7 +100,6 @@ dependencies {
     // Testing
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     annotationProcessor "androidx.room:room-compiler:$room_version"
 
     // Blocking dialog and top snacbkbar
@@ -123,7 +114,6 @@ dependencies {
     implementation 'com.google.android.gms:play-services-mlkit-text-recognition:16.0.0'
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
     implementation 'com.github.mhshams:jnbis:1.1.0'
-    implementation 'net.sf.scuba:scuba-sc-android:0.0.20'
     implementation 'com.madgag.spongycastle:prov:1.58.0.0'
 
     // Zoom image
@@ -133,6 +123,34 @@ dependencies {
     implementation "com.ncorti:slidetoact:0.9.0"
 
     implementation "com.android.volley:volley:1.2.1"
+
+    // Transitive dependencies
+    androidTestImplementation 'androidx.test:monitor:1.6.1'
+    api 'androidx.cardview:cardview:1.0.0'
+    api 'androidx.core:core:1.9.0'
+    api 'androidx.fragment:fragment:1.5.4'
+    api 'androidx.lifecycle:lifecycle-livedata-core:2.5.1'
+    api 'androidx.viewpager:viewpager:1.0.0'
+    api 'com.google.mlkit:common:16.0.0'
+    api(project(':ipv8')) {
+        exclude module: 'lazysodium-java'
+    }
+    implementation 'androidx.documentfile:documentfile:1.0.0'
+    implementation 'androidx.lifecycle:lifecycle-common:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-core-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-process:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
+    implementation 'androidx.sqlite:sqlite:2.4.0'
+    implementation 'app.cash.sqldelight:android-driver:2.0.1'
+    implementation 'app.cash.sqldelight:coroutines-extensions:2.0.1'
+    implementation 'com.google.mlkit:vision-common:16.0.0'
+    implementation 'net.sf.scuba:scuba-smartcards:0.0.18'
+    implementation(project(':ipv8-android')) {
+        exclude group: 'net.java.dev.jna'
+        exclude group: 'org.bouncycastle'
+    }
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {