srctree

Robin Linden parent 92802233 deb30a5a
Migrate dependencies to the Gradle version catalog system

inline split

atox/build.gradle.kts added: 131, removed: 172, total 0

@@ -50,46 +50,46 @@ dependencies {

implementation(project(":core"))

implementation(project(":domain"))

implementation(AndroidX.Core.ktx)

implementation(AndroidX.activity)

implementation(AndroidX.appcompat)

implementation(AndroidX.constraintlayout)

implementation(AndroidX.fragment)

implementation(libs.androidx.core.ktx)

implementation(libs.androidx.activity)

implementation(libs.androidx.appcompat)

implementation(libs.androidx.constraintlayout)

implementation(libs.androidx.fragment)

implementation(Google.Android.material)

implementation(Google.Guava.workaround)

implementation(libs.google.android.material)

implementation(libs.google.guava.workaround)

implementation(KotlinX.Coroutines.core)

implementation(KotlinX.Coroutines.android)

implementation(libs.kotlinx.coroutines.core)

implementation(libs.kotlinx.coroutines.android)

implementation(AndroidX.Navigation.fragment)

implementation(AndroidX.Navigation.ui)

implementation(libs.androidx.navigation.fragment)

implementation(libs.androidx.navigation.ui)

implementation(AndroidX.preference)

implementation(libs.androidx.preference)

implementation(AndroidX.Lifecycle.livedataKtx)

implementation(AndroidX.Lifecycle.runtimeKtx)

implementation(AndroidX.Lifecycle.service)

implementation(AndroidX.Lifecycle.viewmodelKtx)

implementation(libs.androidx.lifecycle.livedata.ktx)

implementation(libs.androidx.lifecycle.runtime.ktx)

implementation(libs.androidx.lifecycle.service)

implementation(libs.androidx.lifecycle.viewmodel.ktx)

implementation(Google.dagger)

kapt(Google.Dagger.compiler)

implementation(libs.google.dagger.core)

kapt(libs.google.dagger.compiler)

implementation(AndroidX.multidex)

implementation(libs.androidx.multidex)

implementation(Nayuki.qrcodegen)

implementation(libs.nayuki.qrcodegen)

implementation(Square.picasso)

implementation(libs.square.picasso)

debugImplementation(Square.leakcanary)

debugImplementation(libs.square.leakcanary)

testImplementation(Test.junit)

testImplementation(libs.test.junit.core)

androidTestImplementation(AndroidX.Test.rules)

androidTestImplementation(AndroidX.Test.runner)

androidTestImplementation(AndroidX.Test.Espresso.core)

androidTestImplementation(AndroidX.Test.Espresso.contrib)

androidTestImplementation(AndroidX.Test.Ext.junit)

androidTestImplementation(Test.mockk)

kaptAndroidTest(Google.Dagger.compiler)

androidTestImplementation(libs.test.rules)

androidTestImplementation(libs.test.runner)

androidTestImplementation(libs.test.espresso.core)

androidTestImplementation(libs.test.espresso.contrib)

androidTestImplementation(libs.test.junit.ext)

androidTestImplementation(libs.test.mockk)

kaptAndroidTest(libs.google.dagger.compiler)

}

buildSrc/src/main/kotlin/Dependencies.kt added: 131, removed: 172, total 0

@@ -25,116 +25,3 @@ object AndroidSdk {

const val minVersion = 19

const val targetVersion = 31

}

object JavaX {

const val inject = "javax.inject:javax.inject:1"

}

object KotlinX {

object Coroutines {

private const val version = "1.6.1"

const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"

const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"

const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"

}

object AndroidX {

object Core {

const val ktx = "androidx.core:core-ktx:1.7.0"

}

const val activity = "androidx.activity:activity:1.4.0"

const val appcompat = "androidx.appcompat:appcompat:1.4.1"

const val constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.3"

const val fragment = "androidx.fragment:fragment:1.4.1"

object Navigation {

private const val version = "2.4.2"

const val fragment = "androidx.navigation:navigation-fragment:$version"

const val ui = "androidx.navigation:navigation-ui:$version"

}

object Lifecycle {

private const val version = "2.4.1"

const val livedataKtx = "androidx.lifecycle:lifecycle-livedata-ktx:$version"

const val runtimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:$version"

const val service = "androidx.lifecycle:lifecycle-service:$version"

const val viewmodelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"

}

const val multidex = "androidx.multidex:multidex:2.0.1"

object Room {

private const val version = "2.4.2"

const val runtime = "androidx.room:room-runtime:$version"

const val ktx = "androidx.room:room-ktx:$version"

const val compiler = "androidx.room:room-compiler:$version"

const val testing = "androidx.room:room-testing:$version"

}

const val preference = "androidx.preference:preference:1.2.0"

object Test {

private const val version = "1.4.0"

const val runner = "androidx.test:runner:$version"

const val rules = "androidx.test:rules:$version"

object Espresso {

private const val version = "3.4.0"

const val core = "androidx.test.espresso:espresso-core:$version"

const val contrib = "androidx.test.espresso:espresso-contrib:$version"

}

object Ext {

const val junit = "androidx.test.ext:junit:1.1.3"

}

object Google {

object Android {

const val material = "com.google.android.material:material:1.5.0"

}

const val dagger = "com.google.dagger:dagger:${Dagger.version}"

object Dagger {

internal const val version = "2.41"

const val compiler = "com.google.dagger:dagger-compiler:$version"

}

// Google's very impressive workaround for the following error:

// Duplicate class com.google.common.util.concurrent.ListenableFuture found

// in modules jetified-guava-19.0 (com.google.guava:guava:19.0) and

// jetified-listenablefuture-1.0 (com.google.guava:listenablefuture:1.0)

object Guava {

const val workaround = "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"

}

object Square {

const val picasso = "com.squareup.picasso:picasso:2.8"

const val leakcanary = "com.squareup.leakcanary:leakcanary-android:2.8.1"

}

object Tox4j {

private const val version = "0.2.3"

const val api = "org.toktok:tox4j-api_2.11:$version"

const val c = "org.toktok:tox4j-c_2.11:$version"

object Android {

private const val version = "0.2.17"

const val x86_64 = "org.toktok:tox4j-c_x86_64-linux-android:$version"

const val arm = "org.toktok:tox4j-c_armv7a-linux-androideabi:$version"

const val aarch64 = "org.toktok:tox4j-c_aarch64-linux-android:$version"

const val i686 = "org.toktok:tox4j-c_i686-linux-android:$version"

}

object Nayuki {

const val qrcodegen = "io.nayuki:qrcodegen:1.7.0"

}

object Test {

const val junit = "junit:junit:4.13.2"

// Pinned to 1.11.0 as 1.12.0 bumps the minSdkVersion to 21.

const val mockk = "io.mockk:mockk-android:1.11.0"

}

core/build.gradle.kts added: 131, removed: 172, total 0

@@ -51,17 +51,17 @@ idea {

}

dependencies {

implementation(JavaX.inject)

api(AndroidX.Room.runtime)

api(AndroidX.Room.ktx)

kapt(AndroidX.Room.compiler)

implementation(libs.javax.inject)

api(libs.androidx.room.runtime)

api(libs.androidx.room.ktx)

kapt(libs.androidx.room.compiler)

testImplementation(Test.junit)

testImplementation(libs.test.junit.core)

androidTestImplementation(AndroidX.Test.runner)

androidTestImplementation(AndroidX.Test.Ext.junit)

androidTestImplementation(AndroidX.Room.testing)

androidTestImplementation(KotlinX.Coroutines.test) {

androidTestImplementation(libs.test.runner)

androidTestImplementation(libs.test.junit.ext)

androidTestImplementation(libs.androidx.room.testing)

androidTestImplementation(libs.kotlinx.coroutines.test) {

// Conflicts with a lot of things due to having embedded "byte buddy" instead of depending on it.

exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-debug")

}

domain/build.gradle.kts added: 131, removed: 172, total 0

@@ -50,10 +50,10 @@ idea {

val needFixing: Configuration by configurations.creating

dependencies {

needFixing(Tox4j.Android.x86_64)

needFixing(Tox4j.Android.i686)

needFixing(Tox4j.Android.arm)

needFixing(Tox4j.Android.aarch64)

needFixing(libs.tox4j.android.amd64)

needFixing(libs.tox4j.android.i686)

needFixing(libs.tox4j.android.arm)

needFixing(libs.tox4j.android.aarch64)

}

tasks.register("fixPaths") {

@@ -79,19 +79,19 @@ tasks.named("preBuild") { dependsOn("fixPaths") }

dependencies {

implementation(project(":core"))

implementation(AndroidX.Core.ktx)

implementation(JavaX.inject)

implementation(KotlinX.Coroutines.core)

api(Tox4j.api)

implementation(Tox4j.c)

implementation(libs.androidx.core.ktx)

implementation(libs.javax.inject)

implementation(libs.kotlinx.coroutines.core)

api(libs.tox4j.api)

implementation(libs.tox4j.c)

testImplementation(Test.junit)

androidTestImplementation(AndroidX.Test.runner)

androidTestImplementation(AndroidX.Test.Ext.junit)

androidTestImplementation(Google.Guava.workaround)

androidTestImplementation(KotlinX.Coroutines.test) {

testImplementation(libs.test.junit.core)

androidTestImplementation(libs.test.runner)

androidTestImplementation(libs.test.junit.ext)

androidTestImplementation(libs.google.guava.workaround)

androidTestImplementation(libs.kotlinx.coroutines.test) {

// Conflicts with a lot of things due to having embedded "byte buddy" instead of depending on it.A

exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-debug")

}

androidTestImplementation(Test.mockk)

androidTestImplementation(libs.test.mockk)

}

filename was Deleted added: 131, removed: 172, total 0

@@ -0,0 +1,72 @@

[versions]

androidx-test = "1.4.0"

coroutines = "1.6.1"

dagger = "2.41"

espresso = "3.4.0"

lifecycle = "2.4.1"

navigation = "2.4.2"

room = "2.4.2"

tox4j-android = "0.2.17"

tox4j-core = "0.2.3"

[libraries]

androidx-activity = "androidx.activity:activity:1.4.0"

androidx-appcompat = "androidx.appcompat:appcompat:1.4.1"

androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.3"

androidx-core-ktx = "androidx.core:core-ktx:1.7.0"

androidx-fragment = "androidx.fragment:fragment:1.4.1"

androidx-multidex = "androidx.multidex:multidex:2.0.1"

androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment", version.ref = "navigation" }

androidx-navigation-ui = { module = "androidx.navigation:navigation-ui", version.ref = "navigation" }

androidx-preference = "androidx.preference:preference:1.2.0"

androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }

androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }

androidx-lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version.ref = "lifecycle" }

androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }

androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }

androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }

androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }

androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "room" }

google-android-material = "com.google.android.material:material:1.5.0"

google-dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }

google-dagger-core = { module = "com.google.dagger:dagger", version.ref = "dagger" }

javax-inject = "javax.inject:javax.inject:1"

kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }

kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }

kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }

nayuki-qrcodegen = "io.nayuki:qrcodegen:1.7.0"

square-leakcanary = "com.squareup.leakcanary:leakcanary-android:2.8.1"

square-picasso = "com.squareup.picasso:picasso:2.8"

tox4j-android-aarch64 = { module = "org.toktok:tox4j-c_aarch64-linux-android", version.ref = "tox4j-android" }

tox4j-android-arm = { module = "org.toktok:tox4j-c_armv7a-linux-androideabi", version.ref = "tox4j-android" }

tox4j-android-i686 = { module = "org.toktok:tox4j-c_i686-linux-android", version.ref = "tox4j-android" }

tox4j-android-amd64 = { module = "org.toktok:tox4j-c_x86_64-linux-android", version.ref = "tox4j-android" }

tox4j-api = { module = "org.toktok:tox4j-api_2.11", version.ref = "tox4j-core" }

tox4j-c = { module = "org.toktok:tox4j-c_2.11", version.ref = "tox4j-core" }

test-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }

test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }

test-junit-core = "junit:junit:4.13.2"

test-junit-ext = "androidx.test.ext:junit:1.1.3"

test-mockk = "io.mockk:mockk-android:1.11.0"

test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }

test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }

# Google's very impressive workaround for the following error:

# Duplicate class com.google.common.util.concurrent.ListenableFuture found

# in modules jetified-guava-19.0 (com.google.guava:guava:19.0) and

# jetified-listenablefuture-1.0 (com.google.guava:listenablefuture:1.0)

google-guava-workaround = "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"

[bundles]

[plugins]