Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependencies catalog #62

Merged
merged 2 commits into from
Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[versions]
coilVersion = "2.3.0"
espressoCore = "3.5.1"
junit = "1.1.5"
junitVersion = "4.13.2"
kotlinxCoroutinesTest = "1.6.4"
ktx = "1.10.1"
appCompat = "1.6.1"
material = "1.9.0"
materialIconsExtended = "1.4.3"
room = "2.5.2"
compose = "2.6.1"
navigation-compose = "2.6.0"

[libraries]
androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junit" }
androidx-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "ktx" }
androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "materialIconsExtended" }
appCompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appCompat" }
coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilVersion" }
coil-video = { module = "io.coil-kt:coil-video", version.ref = "coilVersion" }
junit = { module = "junit:junit", version.ref = "junitVersion" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
room-paging = { group = "androidx.room", name = "room-paging", version.ref = "room" }
room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
room-testing = { group = "androidx.room", name = "room-testing", version.ref = "room" }
viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "compose" }
runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "compose" }
navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation-compose" }

[plugins]
36 changes: 17 additions & 19 deletions sample/app_sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,38 +60,36 @@ dependencies {
implementation(project(":sample:resources"))
implementation(project(":sample:editor"))

implementation("androidx.core:core-ktx:1.10.1")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
implementation(libs.androidx.ktx)
implementation(libs.appCompat)
implementation(libs.material)

val roomVersion = "2.5.2"
implementation(libs.room.runtime)
implementation(libs.room.ktx)
implementation(libs.room.paging)
ksp(libs.room.compiler)

implementation("androidx.room:room-runtime:$roomVersion")
implementation("androidx.room:room-ktx:$roomVersion")
implementation("androidx.room:room-paging:$roomVersion")
ksp("androidx.room:room-compiler:$roomVersion")
implementation(libs.coil.compose)
implementation(libs.coil.video)

implementation("io.coil-kt:coil-compose:$coilVersion")
implementation("io.coil-kt:coil-video:$coilVersion")
implementation(libs.viewmodel.compose)
implementation(libs.runtime.compose)
implementation(libs.navigation.compose)

implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.1")
implementation("androidx.navigation:navigation-compose:2.6.0")
implementation("androidx.activity:activity-compose")
implementation("androidx.compose.material:material-icons-extended:1.4.3")
implementation(libs.androidx.material.icons.extended)

implementation("androidx.activity:activity-compose")
implementation("androidx.compose.material3:material3")
implementation("androidx.compose.material3:material3-window-size-class")


// Compose - Preview
implementation("androidx.compose.ui:ui-tooling-preview")
debugImplementation("androidx.compose.ui:ui-tooling")

val composeBom = platform("androidx.compose:compose-bom:2023.06.00")
implementation(composeBom)

testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
}
20 changes: 10 additions & 10 deletions sample/editor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ dependencies {
implementation(project(":sample:resources"))
implementation(project(":sample:utils"))

implementation("androidx.core:core-ktx:1.10.1")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
implementation(libs.appCompat)
implementation(libs.material)

implementation(libs.viewmodel.compose)
implementation(libs.runtime.compose)
implementation(libs.navigation.compose)

implementation("androidx.navigation:navigation-compose:2.6.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.1")
implementation("androidx.activity:activity-compose")
implementation("androidx.compose.material:material-icons-extended:1.4.3")
implementation(libs.androidx.material.icons.extended)

implementation("androidx.compose.material3:material3")
implementation("androidx.compose.material3:material3-window-size-class")
Expand All @@ -64,7 +64,7 @@ dependencies {
val composeBom = platform("androidx.compose:compose-bom:2023.06.00")
implementation(composeBom)

testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
}
20 changes: 10 additions & 10 deletions sample/note_menu/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,14 @@ dependencies {
implementation(project(":sample:resources"))
implementation(project(":sample:utils"))

implementation("androidx.core:core-ktx:1.10.1")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
implementation(libs.appCompat)
implementation(libs.material)

implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.1")
implementation("androidx.activity:activity-compose")
implementation("androidx.compose.material:material-icons-extended:1.4.3")
implementation(libs.viewmodel.compose)
implementation(libs.runtime.compose)
implementation(libs.androidx.material.icons.extended)

implementation("androidx.activity:activity-compose")
implementation("androidx.compose.material3:material3")
implementation("androidx.compose.material3:material3-window-size-class")

Expand All @@ -65,4 +61,8 @@ dependencies {

val composeBom = platform("androidx.compose:compose-bom:2023.06.00")
implementation(composeBom)

testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
}
14 changes: 5 additions & 9 deletions sample/resources/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,16 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
}

dependencies {

implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
implementation(libs.androidx.ktx)
implementation(libs.appCompat)
}
13 changes: 3 additions & 10 deletions sample/utils/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,13 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
}

dependencies {

implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
}
16 changes: 8 additions & 8 deletions storyteller/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ android {
compileSdk = 33

defaultConfig {
minSdk = 21
minSdk = 24

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
Expand Down Expand Up @@ -60,19 +60,19 @@ kotlin{
val coilVersion = "2.3.0"

dependencies {
implementation("androidx.compose.material:material-icons-extended:1.4.3")
implementation(libs.androidx.material.icons.extended)
// Coil
implementation("io.coil-kt:coil-compose:$coilVersion")
implementation("io.coil-kt:coil-video:$coilVersion")
implementation(libs.coil.compose)
implementation(libs.coil.video)

implementation("androidx.compose.material3:material3")
implementation("androidx.compose.material3:material3-window-size-class")

androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)

testImplementation("junit:junit:4.13.2")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
testImplementation(libs.junit)
testImplementation(libs.kotlinx.coroutines.test)

val composeBom = platform("androidx.compose:compose-bom:2023.06.00")
implementation(composeBom)
Expand Down
22 changes: 10 additions & 12 deletions storyteller_persistence/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {
compileSdk = 33

defaultConfig {
minSdk = 21
minSdk = 24

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
Expand Down Expand Up @@ -54,19 +54,17 @@ kotlin{
}

dependencies {
val roomVersion = "2.5.1"

implementation(project(":storyteller"))

implementation("androidx.room:room-runtime:$roomVersion")
implementation("androidx.room:room-ktx:$roomVersion")
implementation("androidx.room:room-paging:$roomVersion")
ksp("androidx.room:room-compiler:$roomVersion")
implementation(libs.room.runtime)
implementation(libs.room.ktx)
implementation(libs.room.paging)
ksp(libs.room.compiler)

testImplementation("junit:junit:4.13.2")
testImplementation("androidx.room:room-testing:$roomVersion")
testImplementation(libs.junit)
testImplementation(libs.room.testing)

androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(libs.kotlinx.coroutines.test)
}