Skip to content

Commit

Permalink
Use new version scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
klalumiere committed Jun 15, 2024
1 parent 5b41a80 commit 77e37e4
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 70 deletions.
83 changes: 42 additions & 41 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'com.google.devtools.ksp'
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.google.devtools.ksp)
alias(libs.plugins.jetbrains.kotlin.android)
}

//apply plugin: 'kotlin-android'

ksp {
arg("room.schemaLocation", "$projectDir/schemas".toString())
Expand Down Expand Up @@ -65,45 +69,42 @@ android {
}

dependencies {
def espresso_version = "3.5.1"
def lifecycle_version = "2.8.2"
def room_version = "2.6.1"
androidTestImplementation(libs.android.arch.core.core.testing)
androidTestImplementation(libs.androidx.room.room.testing)
androidTestImplementation(libs.androidx.test.core.ktx)
androidTestImplementation(libs.androidx.test.espresso.espresso.contrib)
androidTestImplementation(libs.androidx.test.espresso.espresso.core)
androidTestImplementation(libs.androidx.test.ext.junit)
androidTestImplementation(libs.org.jetbrains.kotlinx.kotlinx.coroutines.test)

annotationProcessor(libs.com.google.dagger.dagger.compiler)

implementation(libs.androidx.activity.activity.ktx)
implementation(libs.androidx.appcompat.appcompat)
implementation(libs.androidx.constraintlayout.constraintlayout)
implementation(libs.androidx.core.core.ktx)
implementation(libs.androidx.fragment.fragment.ktx) // Prevent crash when adding content
implementation(libs.androidx.lifecycle.lifecycle.livedata.ktx)
implementation(libs.androidx.lifecycle.lifecycle.runtime.ktx)
implementation(libs.androidx.lifecycle.lifecycle.viewmodel.ktx)
implementation(libs.androidx.recyclerview.recyclerview.selection)
implementation(libs.androidx.recyclerview.recyclerview)
implementation(libs.androidx.room.room.ktx)
implementation(libs.androidx.room.room.runtime)
implementation(libs.com.google.android.material.material) // content_main.xml ConstraintLayout
implementation(libs.org.jetbrains.kotlin.kotlin.stdlib)

ksp(libs.androidx.room.room.compiler)
ksp(libs.com.google.dagger.dagger.compiler)

annotationProcessor("com.google.dagger:dagger-compiler:2.51.1")
ksp("com.google.dagger:dagger-compiler:2.51.1")
ksp "androidx.room:room-compiler:$room_version"
androidTestImplementation "android.arch.core:core-testing:1.1.1"
androidTestImplementation "androidx.room:room-testing:$room_version"
androidTestImplementation "androidx.test.espresso:espresso-contrib:$espresso_version"
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
androidTestImplementation "androidx.test.ext:junit:1.1.5"
androidTestImplementation "androidx.test:core-ktx:1.5.0"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"
implementation "androidx.activity:activity-ktx:1.9.0"
implementation "androidx.appcompat:appcompat:1.7.0"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.core:core-ktx:1.13.1"
implementation "androidx.fragment:fragment-ktx:1.8.0" // Prevent crash when adding content
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
// Updating `recyclerview-selection` to version `1.1.0` breaks `espresso`'s `longClick`,
// which is used in `EndToEndTests.kt`. Hence, we don't update it for now. See issue at
// https://issuetracker.google.com/issues/188992115
implementation "androidx.recyclerview:recyclerview-selection:1.1.0"
implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation "androidx.room:room-ktx:$room_version"
implementation "androidx.room:room-runtime:$room_version"
implementation "com.google.android.material:material:1.12.0" // content_main.xml ConstraintLayout
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testImplementation "android.arch.core:core-testing:1.1.1"
testImplementation "androidx.lifecycle:lifecycle-runtime-testing:2.8.2"
testImplementation "androidx.test.ext:junit:1.1.5"
testImplementation "androidx.test:core-ktx:1.5.0"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
testImplementation "junit:junit:4.13.2"
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"
testImplementation "org.robolectric:robolectric:4.12.2"
testImplementation(libs.android.arch.core.core.testing)
testImplementation(libs.androidx.lifecycle.lifecycle.runtime.testing)
testImplementation(libs.androidx.test.core.ktx)
testImplementation(libs.androidx.test.ext.junit)
testImplementation(libs.com.nhaarman.mockitokotlin2.mockito.kotlin)
testImplementation(libs.junit.junit)
testImplementation(libs.org.jetbrains.kotlinx.kotlinx.coroutines.test)
testImplementation(libs.org.robolectric.robolectric)

implementation fileTree(dir: "libs", include: ["*.jar"])
}
60 changes: 33 additions & 27 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,31 +1,37 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '2.0.0'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
//buildscript {
// ext.kotlin_version = '2.0.0'
// repositories {
// google()
// mavenCentral()
// }
// dependencies {
// classpath 'com.android.tools.build:gradle:8.5.0'
// classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
//
// // NOTE: Do not place your application dependencies here; they belong
// // in the individual module build.gradle files
// }
//}
//
//plugins {
// id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
// id 'com.google.devtools.ksp' version "2.0.0-1.0.21" apply false
//}
//
//allprojects {
// repositories {
// google()
// mavenCentral()
// }
//}
//
//tasks.register('clean', Delete) {
// delete rootProject.buildDir
//}

plugins {
id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
id 'com.google.devtools.ksp' version "2.0.0-1.0.21" apply false
alias(libs.plugins.android.application) apply false
alias(libs.plugins.google.devtools.ksp) apply false
alias(libs.plugins.jetbrains.kotlin.android) apply false
}

allprojects {
repositories {
google()
mavenCentral()
}
}

tasks.register('clean', Delete) {
delete rootProject.buildDir
}
60 changes: 60 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
[versions]
agp = "8.5.0"
android_arch_core_core_testing = "1.1.1"
androidx_activity_activity_ktx = "1.9.0"
androidx_appcompat_appcompat = "1.7.0"
androidx_constraintlayout_constraintlayout = "2.1.4"
androidx_core_core_ktx = "1.13.1"
androidx_fragment_fragment_ktx = "1.8.0"
androidx_lifecycle = "2.8.2"
androidx_recyclerview_recyclerview = "1.3.2"
# Updating `recyclerview-selection` to version `1.1.0` breaks `espresso`'s `longClick`,
# which is used in `EndToEndTests.kt`. Hence, we don't update it for now. See issue at
# https://issuetracker.google.com/issues/188992115
androidx_recyclerview_recyclerview_selection = "1.1.0"
androidx_room = "2.6.1"
androidx_test_core_ktx = "1.5.0"
androidx_test_espresso = "3.5.1"
androidx_test_ext_junit = "1.1.5"
com_google_android_material_material = "1.12.0"
com_google_dagger_dagger_compiler = "2.51.1"
com_nhaarman_mockitokotlin2_mockito_kotlin = "2.2.0"
junit_junit = "4.13.2"
kotlin = "2.0.0"
kspVersion = "2.0.0-1.0.21"
org_jetbrains_kotlinx_kotlinx_coroutines_test = "1.8.1"
org_robolectric_robolectric = "4.12.2"

[libraries]
android-arch-core-core-testing = { group = "android.arch.core", name = "core-testing", version.ref = "android_arch_core_core_testing" }
androidx-activity-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidx_activity_activity_ktx" }
androidx-appcompat-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx_appcompat_appcompat" }
androidx-constraintlayout-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx_constraintlayout_constraintlayout" }
androidx-core-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx_core_core_ktx" }
androidx-fragment-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidx_fragment_fragment_ktx" }
androidx-lifecycle-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidx_lifecycle" }
androidx-lifecycle-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx_lifecycle" }
androidx-lifecycle-lifecycle-runtime-testing = { group = "androidx.lifecycle", name = "lifecycle-runtime-testing", version.ref = "androidx_lifecycle" }
androidx-lifecycle-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidx_lifecycle" }
androidx-recyclerview-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidx_recyclerview_recyclerview" }
androidx-recyclerview-recyclerview-selection = { group = "androidx.recyclerview", name = "recyclerview-selection", version.ref = "androidx_recyclerview_recyclerview_selection" }
androidx-room-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "androidx_room" }
androidx-room-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "androidx_room" }
androidx-room-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "androidx_room" }
androidx-room-room-testing = { group = "androidx.room", name = "room-testing", version.ref = "androidx_room" }
androidx-test-core-ktx = { group = "androidx.test", name = "core-ktx", version.ref = "androidx_test_core_ktx" }
androidx-test-espresso-espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref = "androidx_test_espresso" }
androidx-test-espresso-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx_test_espresso" }
androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx_test_ext_junit" }
com-google-android-material-material = { group = "com.google.android.material", name = "material", version.ref = "com_google_android_material_material" }
com-google-dagger-dagger-compiler = { group = "com.google.dagger", name = "dagger-compiler", version.ref = "com_google_dagger_dagger_compiler" }
com-nhaarman-mockitokotlin2-mockito-kotlin = { group = "com.nhaarman.mockitokotlin2", name = "mockito-kotlin", version.ref = "com_nhaarman_mockitokotlin2_mockito_kotlin" }
junit-junit = { group = "junit", name = "junit", version.ref = "junit_junit" }
org-jetbrains-kotlin-kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
org-jetbrains-kotlinx-kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "org_jetbrains_kotlinx_kotlinx_coroutines_test" }
org-robolectric-robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "org_robolectric_robolectric" }

[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "kspVersion" }
jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
25 changes: 23 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,23 @@
include ':app'
rootProject.name = "Repertoire"
pluginManagement {
repositories {
google {
content {
includeGroupByRegex("com\\.android.*")
includeGroupByRegex("com\\.google.*")
includeGroupByRegex("androidx.*")
}
}
mavenCentral()
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}

rootProject.name = "Repertoire"
include ':app'

0 comments on commit 77e37e4

Please sign in to comment.