diff --git a/app/build.gradle b/app/build.gradle index 7362f7afd..520b4746d 100644 --- a/app/build.gradle +++ b/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,9 +143,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 +151,38 @@ 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..a8f3161f4 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -78,33 +78,23 @@ 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" @@ -112,13 +102,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 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' } diff --git a/currencyii/build.gradle b/currencyii/build.gradle index de354b0cc..bb3ee3364 100644 --- a/currencyii/build.gradle +++ b/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' } diff --git a/debug/build.gradle b/debug/build.gradle index 915460931..0bf076f65 100644 --- a/debug/build.gradle +++ b/debug/build.gradle @@ -43,24 +43,11 @@ 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" @@ -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..539e80bee 100644 --- a/eurotoken/build.gradle +++ b/eurotoken/build.gradle @@ -51,45 +51,46 @@ android { } dependencies { + api project(':common') - implementation project(':common') - - implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.core:core-ktx:1.9.0' + // AndroidX + api 'androidx.constraintlayout:constraintlayout:2.0.1' + api 'androidx.recyclerview:recyclerview:1.1.0' + api 'com.github.MattSkala:recyclerview-itemadapter:0.4' 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' + api 'com.google.android.material:material:1.1.0' // Kotlin - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + api "org.jetbrains.kotlin:kotlin-stdlib:$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' + api 'io.github.microutils:kotlin-logging:1.7.7' // 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" + + // 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..cf25ac33b 100644 --- a/freedomOfComputing/build.gradle +++ b/freedomOfComputing/build.gradle @@ -46,6 +46,8 @@ android { } dependencies { + implementation project(':common') + // TODO fix direct import, this should rely on common. // BitTorrent implementation files('../common/libs/jlibtorrent-' + jlibtorrent_version + '.jar') @@ -54,32 +56,40 @@ dependencies { implementation files('../common/libs/jlibtorrent-android-x86-' + jlibtorrent_version + '.jar') implementation files('../common/libs/jlibtorrent-android-x86_64-' + jlibtorrent_version + '.jar') - 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.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + + api 'com.google.android.material:material:1.1.0' implementation 'io.github.microutils:kotlin-logging:1.7.7' testImplementation 'junit:junit:4.12' testImplementation "io.mockk:mockk:$mockk_version" 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 { kotlinOptions.freeCompilerArgs += [ - "-opt-in=kotlin.RequiresOptIn" + "-opt-in=kotlin.RequiresOptIn" ] } diff --git a/freedomOfComputing/src/androidTest/java/nl/tudelft/trustchain/FOC/ExampleInstrumentedTest.kt b/freedomOfComputing/src/androidTest/java/nl/tudelft/trustchain/foc/ExampleInstrumentedTest.kt similarity index 100% rename from freedomOfComputing/src/androidTest/java/nl/tudelft/trustchain/FOC/ExampleInstrumentedTest.kt rename to freedomOfComputing/src/androidTest/java/nl/tudelft/trustchain/foc/ExampleInstrumentedTest.kt diff --git a/freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/AppGossiper.kt b/freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/AppGossiper.kt similarity index 100% rename from freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/AppGossiper.kt rename to freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/AppGossiper.kt diff --git a/freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/EvaDownload.kt b/freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/EvaDownload.kt similarity index 100% rename from freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/EvaDownload.kt rename to freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/EvaDownload.kt diff --git a/freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/ExecutionActivity.java b/freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/ExecutionActivity.java similarity index 100% rename from freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/ExecutionActivity.java rename to freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/ExecutionActivity.java diff --git a/freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/MainActivityFOC.kt b/freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/MainActivityFOC.kt similarity index 100% rename from freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/MainActivityFOC.kt rename to freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/MainActivityFOC.kt diff --git a/freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/community/FOCCommunity.kt b/freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/community/FOCCommunity.kt similarity index 100% rename from freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/community/FOCCommunity.kt rename to freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/community/FOCCommunity.kt diff --git a/freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/community/FOCCommunityBase.kt b/freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/community/FOCCommunityBase.kt similarity index 100% rename from freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/community/FOCCommunityBase.kt rename to freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/community/FOCCommunityBase.kt diff --git a/freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/community/FOCMessage.kt b/freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/community/FOCMessage.kt similarity index 100% rename from freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/community/FOCMessage.kt rename to freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/community/FOCMessage.kt diff --git a/freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/util/ExtensionUtils.kt b/freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/util/ExtensionUtils.kt similarity index 100% rename from freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/util/ExtensionUtils.kt rename to freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/util/ExtensionUtils.kt diff --git a/freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/util/MagnetUtils.kt b/freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/util/MagnetUtils.kt similarity index 100% rename from freedomOfComputing/src/main/java/nl/tudelft/trustchain/FOC/util/MagnetUtils.kt rename to freedomOfComputing/src/main/java/nl/tudelft/trustchain/foc/util/MagnetUtils.kt diff --git a/freedomOfComputing/src/test/java/nl/tudelft/trustchain/FOC/AppGossiperTest.kt b/freedomOfComputing/src/test/java/nl/tudelft/trustchain/foc/AppGossiperTest.kt similarity index 100% rename from freedomOfComputing/src/test/java/nl/tudelft/trustchain/FOC/AppGossiperTest.kt rename to freedomOfComputing/src/test/java/nl/tudelft/trustchain/foc/AppGossiperTest.kt diff --git a/freedomOfComputing/src/test/java/nl/tudelft/trustchain/FOC/ExampleUnitTest.kt b/freedomOfComputing/src/test/java/nl/tudelft/trustchain/foc/ExampleUnitTest.kt similarity index 100% rename from freedomOfComputing/src/test/java/nl/tudelft/trustchain/FOC/ExampleUnitTest.kt rename to freedomOfComputing/src/test/java/nl/tudelft/trustchain/foc/ExampleUnitTest.kt diff --git a/freedomOfComputing/src/test/java/nl/tudelft/trustchain/FOC/FOCCommunityMock.kt b/freedomOfComputing/src/test/java/nl/tudelft/trustchain/foc/FOCCommunityMock.kt similarity index 100% rename from freedomOfComputing/src/test/java/nl/tudelft/trustchain/FOC/FOCCommunityMock.kt rename to freedomOfComputing/src/test/java/nl/tudelft/trustchain/foc/FOCCommunityMock.kt diff --git a/freedomOfComputing/src/test/java/nl/tudelft/trustchain/FOC/MagnetByteArray.kt b/freedomOfComputing/src/test/java/nl/tudelft/trustchain/foc/MagnetByteArray.kt similarity index 100% rename from freedomOfComputing/src/test/java/nl/tudelft/trustchain/FOC/MagnetByteArray.kt rename to freedomOfComputing/src/test/java/nl/tudelft/trustchain/foc/MagnetByteArray.kt 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..9f33d4f50 100644 --- a/musicdao/build.gradle +++ b/musicdao/build.gradle @@ -75,13 +75,9 @@ android { } dependencies { + implementation project(':ipv8-android') implementation project(':common') - api(project(':ipv8-android')) { - exclude group: 'net.java.dev.jna' - exclude group: 'org.bouncycastle' - } - // TODO fix direct import, this should rely on common. // BitTorrent implementation files('../common/libs/jlibtorrent-' + jlibtorrent_version + '.jar') @@ -91,65 +87,36 @@ dependencies { implementation files('../common/libs/jlibtorrent-android-x86_64-' + jlibtorrent_version + '.jar') 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' + api 'androidx.appcompat:appcompat:1.2.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' + api 'com.google.android.exoplayer:exoplayer-core: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" + api 'org.bitcoinj:bitcoinj-core:0.15.10' // 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' + api 'com.mpatric:mp3agic:0.9.1' // Integration with activities implementation 'androidx.activity:activity-compose:1.3.1' // Compose Material Design - implementation "androidx.compose.material:material:1.0.1" + api "androidx.compose.material:material:1.0.1" // Animations - implementation "androidx.compose.animation:animation:1.0.1" + api "androidx.compose.animation:animation:1.0.1" // Tooling support (Previews, etc.) 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" @@ -157,22 +124,65 @@ dependencies { implementation "com.google.accompanist:accompanist-navigation-animation:0.29.1-alpha" // Room - implementation "androidx.room:room-runtime:$room_version" + api "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") // 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") + api "com.google.dagger:hilt-android:$hilt_ver" + implementation "androidx.hilt:hilt-navigation-compose:1.0.0-alpha03" kapt("com.google.dagger:hilt-android-compiler:$hilt_ver") // GSON - implementation("com.google.code.gson:gson:2.8.9") - implementation("org.apache.commons:commons-csv:1.9.0") + api "com.google.code.gson:gson:2.8.9" + 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..9b6171b18 100644 --- a/peerai/build.gradle +++ b/peerai/build.gradle @@ -40,28 +40,18 @@ android { } dependencies { - // Other classpath declarations - implementation project(':common') api project(':common') - implementation 'org.apache.commons:commons-text:1.9' + api 'androidx.constraintlayout:constraintlayout:2.1.4' 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' + implementation 'com.squareup.picasso:picasso:2.8' 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..ec946fb39 100644 --- a/valuetransfer/build.gradle +++ b/valuetransfer/build.gradle @@ -65,25 +65,21 @@ android { } dependencies { - implementation project(':common') + api project(':common') + api project(':eurotoken') // AndroidX - implementation 'androidx.appcompat:appcompat:1.1.0' + api 'androidx.appcompat:appcompat:1.1.0' + api 'androidx.constraintlayout:constraintlayout:1.1.3' + api "androidx.recyclerview:recyclerview: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.2.0' - implementation 'com.getbase:floatingactionbutton:1.10.1' + api 'com.google.android.material:material:1.2.0' // Kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" @@ -93,14 +89,10 @@ 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' + api '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' implementation 'com.google.android.gms:play-services-location:21.1.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' @@ -108,11 +100,9 @@ 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 - implementation 'com.jaredrummler:blocking-dialog:1.0.0' + api 'com.jaredrummler:blocking-dialog:1.0.0' implementation 'com.github.Redman1037:TSnackBar:V2.0.0' // Passport onboarding @@ -127,12 +117,37 @@ dependencies { implementation 'com.madgag.spongycastle:prov:1.58.0.0' // Zoom image - implementation 'com.jsibbold:zoomage:1.3.1' + api 'com.jsibbold:zoomage:1.3.1' // Side to confirm - implementation "com.ncorti:slidetoact:0.9.0" + api "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') } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {