Skip to content

Commit

Permalink
Kotlin 2.0
Browse files Browse the repository at this point in the history
Version catalog
  • Loading branch information
mtotschnig committed Sep 11, 2024
1 parent 753acd8 commit f60943f
Show file tree
Hide file tree
Showing 25 changed files with 528 additions and 308 deletions.
55 changes: 6 additions & 49 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
compose_compiler_version = '1.5.14'
kotlin_version = '1.9.24'
agp_version = '8.6.0'
}
}
plugins {
id 'com.android.application' version "$agp_version" apply false
id 'com.android.library' version "$agp_version" apply false
id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
id 'com.android.dynamic-feature' version "$agp_version" apply false
id("com.google.devtools.ksp") version "$kotlin_version-1.0.20" apply false
alias libs.plugins.android.application apply false
alias libs.plugins.android.library apply false
alias libs.plugins.android.dynamic.feature apply false
alias libs.plugins.jetbrains.kotlin.android apply false
alias libs.plugins.ksp apply false
alias libs.plugins.compose.compiler apply false
//drive
//id 'com.google.gms.google-services' version '4.4.0' apply false
}
Expand All @@ -29,42 +22,6 @@ ext {
androidSupportTestVersion = "1.6.1"
androidxTextExtJunit = "1.2.1"
daggerVersion = '2.51.1'
okHttpVersion = "4.12.0"
acraVersion = "5.11.3"
robolectricVersion = '4.13'
roomVersion = "2.6.1"
archLifecycleVersion = '2.8.5'
androidxArchVersion = '2.2.0'
fragmentVersion = "1.8.3"
coroutines = '1.8.1'
mockitoVersion = '5.12.0'
retrofitVersion = '2.11.0'
androidXCoreVersion = "1.13.1"
appcompatVersion = "1.7.0"
picassoVersion = "2.8"
recyclerview = "1.3.2"
materialComponents = "1.12.0"
junitVersion = "4.13.2"
timberVersion = "5.0.1"
assertjVersion = "3.19.0"
assertjVersionAndroid = "2.9.1"
annotations = '1.8.0'
commonsLang = '3.14.0'
commonsText = '1.12.0'
ktor = '2.3.11'
bouncycastle = "1.71"
desugarVersion = '2.0.4'
mlkitTextRecognition = "16.0.1"
truthVersion = '1.4.2'
accompanist = "0.36.0"
requery = "3.36.0"
androidxSqlite = "2.4.0"
barista = "4.3.0"
googleHttp = "1.44.1"
//composeDevBom = "dev.chrisbanes.compose:compose-bom:2024.05.00-alpha02"
composeBom = "androidx.compose:compose-bom:2024.09.00"
activityCompose = "1.9.2"
workManager = "2.9.1"
}

subprojects {
Expand Down
18 changes: 9 additions & 9 deletions drive/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ android {

dependencies {
implementation project(":myExpenses")
implementation 'com.evernote:android-state:1.4.1'
kapt 'com.evernote:android-state-processor:1.4.1'
implementation libs.android.state
kapt libs.android.state.processor

implementation 'com.google.android.gms:play-services-auth:21.2.0'
implementation("com.google.http-client:google-http-client-gson:$googleHttp") {
implementation libs.play.services.auth
implementation(libs.google.http.client.gson) {
exclude module: 'httpclient'
exclude module: 'commons-logging'
}
implementation("com.google.http-client:google-http-client-android:$googleHttp") {
implementation(libs.google.http.client.android) {
exclude group: 'org.apache.httpcomponents'
}
implementation('com.google.api-client:google-api-client-android:2.3.0') {
implementation(libs.google.api.client.android) {
exclude group: 'org.apache.httpcomponents'
}
implementation('com.google.apis:google-api-services-drive:v3-rev20240123-2.0.0') {
implementation(libs.google.api.services.drive) {
exclude group: 'org.apache.httpcomponents'
}

kapt "com.google.dagger:dagger-compiler:$daggerVersion"
implementation "com.google.dagger:dagger:$daggerVersion"
kapt libs.dagger.compiler
implementation libs.dagger
}
8 changes: 4 additions & 4 deletions dropbox/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ android {
dependencies {
implementation project(":myExpenses")
implementation project(":jackson")
implementation 'com.evernote:android-state:1.4.1'
kapt 'com.evernote:android-state-processor:1.4.1'
implementation libs.android.state
kapt libs.android.state.processor

implementation 'com.dropbox.core:dropbox-core-sdk:7.0.0'
implementation 'com.dropbox.core:dropbox-android-sdk:7.0.0'
implementation libs.dropbox.core.sdk
implementation libs.dropbox.android.sdk
}
43 changes: 20 additions & 23 deletions fints/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
id 'kotlin-android'
id 'kotlin-parcelize'
id 'kotlin-kapt'
alias libs.plugins.compose.compiler
}

android {
Expand All @@ -24,35 +25,31 @@ android {
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion compose_compiler_version
}
}

dependencies {
implementation project(':myExpenses')
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugarVersion"
def composeBom = platform("$composeBom")
implementation composeBom
implementation "androidx.compose.ui:ui"
implementation("androidx.compose.material3:material3")
implementation "androidx.compose.ui:ui-tooling-preview"
debugImplementation "androidx.compose.ui:ui-tooling"
implementation "androidx.activity:activity-compose:$activityCompose"
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.runtime:runtime-livedata"
coreLibraryDesugaring libs.android.desugar
implementation platform(libs.androidx.compose.bom)
implementation libs.androidx.ui
implementation(libs.androidx.compose.material3)
implementation libs.androidx.ui.tooling.preview
debugImplementation libs.androidx.ui.tooling
implementation libs.androidx.activity.compose
implementation libs.androidx.material.icons.extended
implementation libs.androidx.runtime.livedata

implementation 'com.github.hbci4j:hbci4j-core:3.1.82'
implementation 'xerces:xercesImpl:2.12.2'
implementation "org.apache.commons:commons-lang3:$commonsLang"
implementation libs.hbci4j.core
implementation libs.xercesimpl
implementation libs.commons.lang3

implementation "androidx.core:core-ktx:$androidXCoreVersion"
implementation libs.androidx.core.ktx

kapt "com.google.dagger:dagger-compiler:$daggerVersion"
implementation "com.google.dagger:dagger:$rootProject.daggerVersion"
kapt libs.dagger.compiler
implementation libs.dagger

testImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test.ext:junit:$androidxTextExtJunit"
androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
androidTestImplementation "androidx.annotation:annotation:$annotations"
testImplementation libs.junit
androidTestImplementation libs.androidx.junit
androidTestImplementation libs.androidx.espresso.core
androidTestImplementation libs.androidx.annotation
}
Loading

0 comments on commit f60943f

Please sign in to comment.