Cleanup/depedencies

app/build.gradle

@@ -116,20 +116,9 @@ dependencies {
     implementation project(':eurotoken')
     implementation project(':valuetransfer')
     implementation project(':peerai')
-    api(project(':common')) {
-        exclude group: 'net.java.dev.jna'
-    }
-    api(project(':common-ethereum')) {
-        exclude group: 'net.java.dev.jna'
-    }
-    api(project(':currencyii')) {
-        exclude group: 'net.java.dev.jna'
-    }
-    api(project(':musicdao')) {
-        exclude group: 'net.java.dev.jna'
-    }
-
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc'
+    implementation project(':common')
+    implementation project(':currencyii')
+    implementation project(':musicdao')
 
     // AndroidX
     implementation "androidx.datastore:datastore-preferences:1.0.0"
@@ -138,14 +127,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,29 +143,46 @@ 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')
 
     // 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'
 }
 
 

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'
 }

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'
+    }
 }

common/build.gradle

@@ -78,47 +78,31 @@ repositories {
 }
 
 dependencies {
-    api(project(':ipv8-android')) {
-        exclude group: 'net.java.dev.jna'
-        exclude group: 'org.bouncycastle'
-    }
+    implementation project(':ipv8-android')
 
-    api 'com.google.guava:guava:30.0-android'
+    implementation 'com.google.guava:guava:30.0-android'
 
     // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.constraintlayout:constraintlayout:1.1.3'
     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
-    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
+    api 'com.journeyapps:zxing-android-embedded:4.3.0'
 
     // Material
-    implementation 'com.google.android.material:material:1.1.0'
+    api 'com.google.android.material:material:1.1.0'
 
     // 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"
 
-    // 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 group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.15.10'
     api project(':geth-android')
 
     // BitTorrent
@@ -130,14 +114,28 @@ dependencies {
 
     // Testing
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
     testImplementation "io.mockk:mockk:$mockk_version"
-    testImplementation 'org.json:json:20190722'
     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'
 }
 
 

currencyii/build.gradle

@@ -52,55 +52,60 @@ android {
 
 dependencies {
     implementation project(':ipv8-android')
-    implementation project(':common')
+    api project(':common')
 
     // AndroidX
+    api 'androidx.constraintlayout:constraintlayout:1.1.3'
     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'
+    api 'com.google.android.material:material:1.1.0'
 
     // 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"
-    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"
+    api 'org.bitcoinj:bitcoinj-core:0.15.10'
 
     // GSON
-    implementation 'com.google.code.gson:gson:2.8.6'
+    api 'com.google.code.gson:gson:2.8.6'
+
+    // 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'
 
-    // HTTP requests
-    implementation 'com.android.volley:volley:1.2.0'
 
 }
 

debug/build.gradle

@@ -43,45 +43,35 @@ android {
 }
 
 dependencies {
-    implementation project(':common')
+    api 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"
     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"
 
-    // 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"
     ]
 }