From dd97492be2b3ef7e944ff6c57595ec038595d30f Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 12 Oct 2023 13:58:17 +0200 Subject: [PATCH] android-module-dependecies.kts --- app/build.gradle.kts | 6 +- build.gradle.kts | 1 - buildSrc/build.gradle.kts | 15 ++++ buildSrc/src/main/kotlin/Libs.kt | 3 - buildSrc/src/main/kotlin/Versions.kt | 8 +++ .../android-module-dependencies.gradle.kts | 70 +++++++++++++++++++ core/graphview/build.gradle.kts | 3 +- core/interfaces/build.gradle.kts | 5 +- 8 files changed, 99 insertions(+), 12 deletions(-) create mode 100644 buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts diff --git a/app/build.gradle.kts b/app/build.gradle.kts index de2d0fc981..41e63f196b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,6 +15,8 @@ plugins { apply(from = "${project.rootDir}/core/main/android_dependencies.gradle") apply(from = "${project.rootDir}/core/main/jacoco_global.gradle") +apply(from = "${project.rootDir}/core/main/test_dependencies.gradle") + repositories { mavenCentral() @@ -75,7 +77,7 @@ fun gitAvailable(): Boolean { } catch (ignored: Exception) { return false // NoGitSystemAvailable } - return !stringBuilder.toString().isEmpty() + return stringBuilder.toString().isNotEmpty() } @@ -222,8 +224,6 @@ dependencies { api(Libs.Rx.rxDogTag) } -apply(from = "${project.rootDir}/core/main/test_dependencies.gradle") - println("-------------------") println("isMaster: ${isMaster()}") println("gitAvailable: ${gitAvailable()}") diff --git a/build.gradle.kts b/build.gradle.kts index 11d67c79fe..fc3d29062d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -75,7 +75,6 @@ buildscript { plugins { id("org.jlleitschuh.gradle.ktlint") version "11.6.1" - id("org.jetbrains.kotlin.android") version Libs.Kotlin.kotlin apply false } allprojects { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index b22ed732fd..9984355b5f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,7 +1,22 @@ +object KtsBuildVersions { + + const val gradle = "8.1.2" + const val kotlin = "1.9.0" +} + plugins { `kotlin-dsl` + `kotlin-dsl-precompiled-script-plugins` } repositories { + google() mavenCentral() + gradlePluginPortal() +} + +dependencies { + implementation("com.android.tools.build:gradle:${KtsBuildVersions.gradle}") +// implementation("com.android.tools.build:gradle-api:${KtsBuildVersions.gradle}") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${KtsBuildVersions.kotlin}") } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index f4d4515c51..1980828178 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -62,9 +62,6 @@ object Libs { 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" const val room = "2.5.2" const val lifecycle = "2.6.2" const val coroutines = "1.7.3" diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 09f425e9d0..6c93da38e7 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,15 @@ +import org.gradle.api.JavaVersion + object Versions { const val appVersion = "3.2.0-dev-m" const val versionCode = 1500 const val ndkVersion = "21.1.6352462" + + const val compileSdk = 34 + const val minSdk = 28 + const val wearMinSdk = 26 + + val javaVersion = JavaVersion.VERSION_11 } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts b/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts new file mode 100644 index 0000000000..5747f3fc2d --- /dev/null +++ b/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts @@ -0,0 +1,70 @@ +plugins { + id("com.android.library") + id("kotlin-android") + id("kotlin-kapt") +} + +android { + compileSdk = Versions.compileSdk + defaultConfig { + minSdk = 28 + @Suppress("DEPRECATION") + targetSdk = 28 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildFeatures { + viewBinding = true + } + + buildTypes { + named("release") { + isMinifyEnabled = false + setProguardFiles(listOf(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")) + } + } + + sourceSets { + named("main") { + jniLibs.srcDirs(listOf("src/main/jniLibs")) + } + } + + compileOptions { + sourceCompatibility = Versions.javaVersion + targetCompatibility = Versions.javaVersion + } + + lint { + checkReleaseBuilds = false + disable += "MissingTranslation" + disable += "ExtraTranslation" + } + + flavorDimensions.add("standard") + productFlavors { + create("full") { + dimension = "standard" + } + create("pumpcontrol") { + dimension = "standard" + } + create("aapsclient") { + dimension = "standard" + } + create("aapsclient2") { + dimension = "standard" + } + } + + // disable for modules here + buildFeatures { + buildConfig = false + } +} + +dependencies { + kapt(Libs.Dagger.androidProcessor) + kapt(Libs.Dagger.compiler) +} diff --git a/core/graphview/build.gradle.kts b/core/graphview/build.gradle.kts index 390515fab8..256ed30a16 100644 --- a/core/graphview/build.gradle.kts +++ b/core/graphview/build.gradle.kts @@ -2,10 +2,9 @@ plugins { id("com.android.library") id("kotlin-android") id("kotlin-kapt") + id("android-module-dependencies") } -apply(from = "${project.rootDir}/core/main/android_dependencies.gradle") -apply(from = "${project.rootDir}/core/main/android_module_dependencies.gradle") android { diff --git a/core/interfaces/build.gradle.kts b/core/interfaces/build.gradle.kts index e6827cc56e..32c1304303 100644 --- a/core/interfaces/build.gradle.kts +++ b/core/interfaces/build.gradle.kts @@ -5,10 +5,9 @@ plugins { id("kotlin-allopen") id("kotlin-parcelize") id("kotlinx-serialization") + id("android-module-dependencies") } -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") @@ -17,7 +16,7 @@ android { namespace = "app.aaps.core.interfaces" defaultConfig { - minSdk = 26 // for wear + minSdk = Versions.wearMinSdk // for wear } }