From 6940e0d2247e4b2b0e5fe58a9e4f032da144d98a Mon Sep 17 00:00:00 2001 From: CranberrySoup <142951702+CranberrySoup@users.noreply.github.com> Date: Wed, 3 Apr 2024 01:26:07 +0200 Subject: [PATCH] Buildconfig testing --- app/build.gradle.kts | 6 +++++- build.gradle.kts | 2 ++ library/build.gradle.kts | 13 +++++++++++++ .../kotlin/com/lagradost/api/BuildConfig.kt | 7 ------- .../kotlin/com/lagradost/api/BuildConfig.kt | 7 ------- .../jvmMain/kotlin/com/lagradost/api/BuildConfig.kt | 7 ------- 6 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 library/src/androidMain/kotlin/com/lagradost/api/BuildConfig.kt delete mode 100644 library/src/commonMain/kotlin/com/lagradost/api/BuildConfig.kt delete mode 100644 library/src/jvmMain/kotlin/com/lagradost/api/BuildConfig.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6fd97387..c0495f62 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,6 +13,7 @@ plugins { val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/" val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first() +var isLibraryDebug = false fun String.execute() = ByteArrayOutputStream().use { baot -> if (project.exec { @@ -103,6 +104,7 @@ android { ) } debug { + isLibraryDebug = true isDebuggable = true applicationIdSuffix = ".debug" proguardFiles( @@ -233,7 +235,9 @@ dependencies { implementation("androidx.work:work-runtime-ktx:2.9.0") implementation("com.github.Blatzar:NiceHttp:0.4.11") // HTTP Lib - implementation(project(":library")) + implementation(project(":library") { + this.extra.set("isDebug", isLibraryDebug) + }) } tasks.register("androidSourcesJar", Jar::class) { diff --git a/build.gradle.kts b/build.gradle.kts index 8a48b427..21291217 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,6 +9,8 @@ buildscript { classpath("com.android.tools.build:gradle:8.2.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22") classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") + // Universal build config + classpath("com.codingfeline.buildkonfig:buildkonfig-gradle-plugin:0.15.1") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle.kts files diff --git a/library/build.gradle.kts b/library/build.gradle.kts index c66db5e1..a9d27ecd 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -1,7 +1,10 @@ +import com.codingfeline.buildkonfig.compiler.FieldSpec + plugins { kotlin("multiplatform") id("maven-publish") id("com.android.library") + id("com.codingfeline.buildkonfig") } kotlin { @@ -28,6 +31,16 @@ tasks.withType { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() } +buildkonfig { + packageName = "com.lagradost.api" + exposeObjectWithName = "BuildConfig" + + defaultConfigs { + val isDebug = kotlin.runCatching { extra.get("isDebug") }.getOrNull() == true + buildConfigField(FieldSpec.Type.BOOLEAN, "DEBUG", isDebug.toString()) + } +} + android { compileSdk = 34 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") diff --git a/library/src/androidMain/kotlin/com/lagradost/api/BuildConfig.kt b/library/src/androidMain/kotlin/com/lagradost/api/BuildConfig.kt deleted file mode 100644 index eda0eab5..00000000 --- a/library/src/androidMain/kotlin/com/lagradost/api/BuildConfig.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.lagradost.api - -actual class BuildConfig { - actual companion object { - actual val DEBUG = true - } -} \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/api/BuildConfig.kt b/library/src/commonMain/kotlin/com/lagradost/api/BuildConfig.kt deleted file mode 100644 index 5f4b1d92..00000000 --- a/library/src/commonMain/kotlin/com/lagradost/api/BuildConfig.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.lagradost.api - -expect class BuildConfig { - companion object { - val DEBUG: Boolean - } -} \ No newline at end of file diff --git a/library/src/jvmMain/kotlin/com/lagradost/api/BuildConfig.kt b/library/src/jvmMain/kotlin/com/lagradost/api/BuildConfig.kt deleted file mode 100644 index eda0eab5..00000000 --- a/library/src/jvmMain/kotlin/com/lagradost/api/BuildConfig.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.lagradost.api - -actual class BuildConfig { - actual companion object { - actual val DEBUG = true - } -} \ No newline at end of file