From 2511228202d4a4db18c4c3215e7df5aea4f4098a Mon Sep 17 00:00:00 2001 From: Chris Paleopanos Date: Mon, 20 Jul 2026 17:34:02 +0300 Subject: [PATCH 1/3] Refactor property fetching to Gradle properties --- .../kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/kmmbridge/src/main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt b/kmmbridge/src/main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt index abd9c23c..34a7365a 100644 --- a/kmmbridge/src/main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt +++ b/kmmbridge/src/main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt @@ -14,17 +14,11 @@ package co.touchlab.kmmbridge import org.gradle.api.Project -import org.gradle.api.plugins.ExtraPropertiesExtension import org.gradle.api.publish.PublishingExtension import org.gradle.kotlin.dsl.getByType val Project.publishingExtension get() = extensions.getByType() fun Project.findStringProperty(name: String): String? { - rootProject.extensions.getByType(ExtraPropertiesExtension::class.java).run { - if (has(name)) { - return get(name).toString() - } - } - return null + return providers.gradleProperty(name).getOrNull() } From 4f857f85393082a945e50618006983881b604e45 Mon Sep 17 00:00:00 2001 From: Gustavo Fao Valvassori Date: Fri, 11 Sep 2026 15:59:19 -0300 Subject: [PATCH 2/3] Fixed remaining cases that break isolation --- .../co/touchlab/kmmbridge/github/internal/GithubApi.kt | 8 +++----- .../co/touchlab/kmmbridge/gitlab/internal/GitLabApi.kt | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/kmmbridge-github/src/main/kotlin/co/touchlab/kmmbridge/github/internal/GithubApi.kt b/kmmbridge-github/src/main/kotlin/co/touchlab/kmmbridge/github/internal/GithubApi.kt index e14b9d60..23722bd5 100644 --- a/kmmbridge-github/src/main/kotlin/co/touchlab/kmmbridge/github/internal/GithubApi.kt +++ b/kmmbridge-github/src/main/kotlin/co/touchlab/kmmbridge/github/internal/GithubApi.kt @@ -17,7 +17,7 @@ import co.touchlab.kmmbridge.findStringProperty import org.gradle.api.Project internal val Project.githubPublishTokenOrNull: String? - get() = project.property("GITHUB_PUBLISH_TOKEN") as String? + get() = project.findStringProperty("GITHUB_PUBLISH_TOKEN") internal val Project.githubPublishUser: String? get() = project.findStringProperty("GITHUB_PUBLISH_USER") @@ -37,10 +37,8 @@ internal val Project.githubRepoOrNull: String? internal val Project.githubPublishToken get() = - ( - project.property("GITHUB_PUBLISH_TOKEN") - ?: throw IllegalArgumentException("KMMBridge Github operations need property GITHUB_PUBLISH_TOKEN") - ) as String + project.findStringProperty("GITHUB_PUBLISH_TOKEN") + ?: throw IllegalArgumentException("KMMBridge Github operations need property GITHUB_PUBLISH_TOKEN") internal val Project.githubArtifactReleaseId get() = project.findStringProperty("GITHUB_ARTIFACT_RELEASE_ID") diff --git a/kmmbridge-gitlab/src/main/kotlin/co/touchlab/kmmbridge/gitlab/internal/GitLabApi.kt b/kmmbridge-gitlab/src/main/kotlin/co/touchlab/kmmbridge/gitlab/internal/GitLabApi.kt index 75215f87..9c7b8e3f 100644 --- a/kmmbridge-gitlab/src/main/kotlin/co/touchlab/kmmbridge/gitlab/internal/GitLabApi.kt +++ b/kmmbridge-gitlab/src/main/kotlin/co/touchlab/kmmbridge/gitlab/internal/GitLabApi.kt @@ -18,7 +18,7 @@ import java.net.URLEncoder import org.gradle.api.Project internal val Project.gitLabPublishTokenOrNull: String? - get() = project.property("GITLAB_PUBLISH_TOKEN") as String? + get() = project.findStringProperty("GITLAB_PUBLISH_TOKEN") internal val Project.gitLabPublishUser: String? get() = project.findStringProperty("GITLAB_PUBLISH_USER") From 794b9b8f6d4a7303a5685a827ee3242f6bb0eb7d Mon Sep 17 00:00:00 2001 From: Gustavo Fao Valvassori Date: Fri, 11 Sep 2026 16:07:15 -0300 Subject: [PATCH 3/3] ktlint --- .../main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kmmbridge/src/main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt b/kmmbridge/src/main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt index 34a7365a..054ce399 100644 --- a/kmmbridge/src/main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt +++ b/kmmbridge/src/main/kotlin/co/touchlab/kmmbridge/ProjectExtensions.kt @@ -19,6 +19,4 @@ import org.gradle.kotlin.dsl.getByType val Project.publishingExtension get() = extensions.getByType() -fun Project.findStringProperty(name: String): String? { - return providers.gradleProperty(name).getOrNull() -} +fun Project.findStringProperty(name: String): String? = providers.gradleProperty(name).getOrNull()