From 0084ca06a18b798d8fbb33ac80ab436e3b9518c1 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sat, 14 Oct 2023 19:49:48 +0200 Subject: [PATCH] all-open-dependecies -> kts --- buildSrc/build.gradle.kts | 4 ++-- .../src/main/kotlin/all-open-dependencies.gradle.kts | 12 ++++++++++++ core/interfaces/build.gradle.kts | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 buildSrc/src/main/kotlin/all-open-dependencies.gradle.kts diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 9984355b5f..c7ac53bd42 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -17,6 +17,6 @@ repositories { 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}") + implementation(kotlin("gradle-plugin", version = KtsBuildVersions.kotlin)) + implementation(kotlin("allopen", version = KtsBuildVersions.kotlin)) } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/all-open-dependencies.gradle.kts b/buildSrc/src/main/kotlin/all-open-dependencies.gradle.kts new file mode 100644 index 0000000000..756dbced71 --- /dev/null +++ b/buildSrc/src/main/kotlin/all-open-dependencies.gradle.kts @@ -0,0 +1,12 @@ + +plugins { + id("com.android.library") + id("kotlin-android") + id("kotlin-kapt") + id("kotlin-allopen") +} + +allOpen { + // allows mocking for classes w/o directly opening them for release builds + annotation("app.aaps.annotations.OpenForTesting") +} diff --git a/core/interfaces/build.gradle.kts b/core/interfaces/build.gradle.kts index 32c1304303..5efa25c7de 100644 --- a/core/interfaces/build.gradle.kts +++ b/core/interfaces/build.gradle.kts @@ -2,13 +2,13 @@ plugins { id("com.android.library") id("kotlin-android") id("kotlin-kapt") - id("kotlin-allopen") + //id("kotlin-allopen") id("kotlin-parcelize") id("kotlinx-serialization") id("android-module-dependencies") + id("all-open-dependencies") } -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")