diff --git a/build.gradle.kts b/build.gradle.kts index 33ca1efc5d..a5054adc2c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,7 +24,6 @@ buildscript { set("gridlayout_version", "1.0.0") set("constraintlayout_version", "2.1.4") set("preferencektx_version", "1.2.1") - set("commonslang3_version", "3.13.0") set("commonscodec_version", "1.16.0") set("guava_version", "32.1.2-jre") set("jodatime_version", "2.12.5") @@ -51,12 +50,10 @@ buildscript { set("wearable_version", "2.9.0") set("play_services_wearable_version", "18.1.0") set("play_services_location_version", "21.0.1") - set("play_services_measurement_version", "21.3.0") set("kotlinx_datetime_version", "0.4.1") set("kotlinx_serialization_version", "1.6.0") - set("caverock_androidsvg_version", "1.4") } repositories { google() diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 5c4a55b760..5b65fb7495 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -2,21 +2,66 @@ object Libs { object Kotlin { + const val kotlin = "1.9.10" } - object AndroidX { - const val core = "androidx.core:core-ktx:1.12.0" + + object KotlinX { + + private const val serialization = "1.6.0" + + const val serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization" + const val serializationProtobuf = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$serialization" } + + object AndroidX { + + const val core = "androidx.core:core-ktx:1.12.0" + const val appCompat = "androidx.appcompat:appcompat:1.6.1" + const val preference = "androidx.preference:preference-ktx:1.2.1" + const val workRuntimeKtx = "androidx.work:work-runtime-ktx:2.8.1" + } + + object Google { + object PlayServices { + + const val measurementApi = "com.google.android.gms:play-services-measurement-api:21.3.0" + } + } + object Dagger { - private const val dagger = "2.48" - const val androidProcessor = "com.google.dagger:dagger-android-processor:$dagger" - const val compiler = "com.google.dagger:dagger-compiler:$dagger" + + private const val version = "2.48" + const val dagger = "com.google.dagger:dagger:$version" + const val android = "com.google.dagger:dagger-android:$version" + const val androidProcessor = "com.google.dagger:dagger-android-processor:$version" + const val androidSupport = "com.google.dagger:dagger-android-support:$version" + const val compiler = "com.google.dagger:dagger-compiler:$version" } object Rx { + const val rxDogTag = "com.uber.rxdogtag2:rxdogtag:2.0.2" + const val rxJava = "io.reactivex.rxjava3:rxjava:3.1.7" + const val rxKotlin = "io.reactivex.rxjava3:rxkotlin:3.0.1" + const val rxAndroid = "io.reactivex.rxjava3:rxandroid:3.0.2" } + + object Apache { + + const val commonsLang3 = "org.apache.commons:commons-lang3:3.13.0" + } + + object Logging { + + const val slf4jApi = "org.slf4j:slf4j-api:1.7.36" // 2.0.x breaks logging. Code change needed + const val logbackAndroid = "com.github.tony19:logback-android:2.0.0" + } + + const val joda = "net.danlew:android.joda:2.12.5" + const val androidSvg = "com.caverock:androidsvg:1.4" + const val rxjava = "3.1.7" const val rxandroid = "3.0.2" const val rxkotlin = "3.0.1" @@ -28,7 +73,6 @@ object Libs { const val ormLite = "4.46" const val gson = "2.10.1" const val nav = "2.7.3" - const val appcompat = "1.6.1" const val material = "1.9.0" const val gridlayout = "1.0.0" const val constraintlayout = "2.1.4" @@ -36,11 +80,9 @@ object Libs { const val commonslang3 = "3.13.0" const val commonscodec = "1.16.0" const val guava = "32.1.2-jre" - const val jodatime = "2.12.5" const val work = "2.8.1" const val tink = "1.10.0" const val json = "20230618" - const val joda = "2.12.5" const val swipe = "1.1.0" const val junit = "4.13.2" diff --git a/core/interfaces/build.gradle b/core/interfaces/build.gradle deleted file mode 100644 index 23a82717bd..0000000000 --- a/core/interfaces/build.gradle +++ /dev/null @@ -1,54 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-allopen' - id 'kotlin-parcelize' - id 'kotlinx-serialization' -} - -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" -apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/main/test_dependencies.gradle" -apply from: "${project.rootDir}/core/main/jacoco_global.gradle" - -android { - - namespace 'app.aaps.core.interfaces' - defaultConfig { - minSdkVersion 26 // for wear - } -} - -dependencies { - implementation project(':database:entities') - - api "androidx.appcompat:appcompat:$appcompat_version" - api "androidx.preference:preference-ktx:$preferencektx_version" - api "net.danlew:android.joda:$joda_version" - - - api "com.google.dagger:dagger:$dagger_version" - api "com.google.dagger:dagger-android:$dagger_version" - api "com.google.dagger:dagger-android-support:$dagger_version" - - //Logger - api 'org.slf4j:slf4j-api:1.7.36' // 2.0.x breaks logging. Code change needed - api 'com.github.tony19:logback-android:2.0.0' - - api "com.google.android.gms:play-services-measurement-api:$play_services_measurement_version" - - api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_version" - api "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinx_serialization_version" - api "com.caverock:androidsvg:$caverock_androidsvg_version" - api "org.apache.commons:commons-lang3:$commonslang3_version" - - //RxBus - api "io.reactivex.rxjava3:rxjava:$rxjava_version" - api "io.reactivex.rxjava3:rxkotlin:$rxkotlin_version" - api "io.reactivex.rxjava3:rxandroid:$rxandroid_version" - - // WorkerClasses - api "androidx.work:work-runtime-ktx:$work_version" -} \ No newline at end of file diff --git a/core/interfaces/build.gradle.kts b/core/interfaces/build.gradle.kts new file mode 100644 index 0000000000..e6827cc56e --- /dev/null +++ b/core/interfaces/build.gradle.kts @@ -0,0 +1,52 @@ +plugins { + id("com.android.library") + id("kotlin-android") + id("kotlin-kapt") + id("kotlin-allopen") + id("kotlin-parcelize") + id("kotlinx-serialization") +} + +apply(from = "${project.rootDir}/core/main/android_dependencies.gradle") +apply(from = "${project.rootDir}/core/main/android_module_dependencies.gradle") +apply(from = "${project.rootDir}/core/main/allopen_dependencies.gradle") +apply(from = "${project.rootDir}/core/main/test_dependencies.gradle") +apply(from = "${project.rootDir}/core/main/jacoco_global.gradle") + +android { + + namespace = "app.aaps.core.interfaces" + defaultConfig { + minSdk = 26 // for wear + } +} + +dependencies { + implementation(project(":database:entities")) + + api(Libs.AndroidX.appCompat) + api(Libs.AndroidX.preference) + api(Libs.joda) + + api(Libs.Dagger.androidSupport) + + //Logger + api(Libs.Logging.slf4jApi) + api(Libs.Logging.logbackAndroid) + + api(Libs.Google.PlayServices.measurementApi) + + api(Libs.KotlinX.serializationJson) + api(Libs.KotlinX.serializationProtobuf) + + api(Libs.androidSvg) + api(Libs.Apache.commonsLang3) + + //RxBus + api(Libs.Rx.rxJava) + api(Libs.Rx.rxKotlin) + api(Libs.Rx.rxAndroid) + + // WorkerClasses + api(Libs.AndroidX.workRuntimeKtx) +} \ No newline at end of file