build: Fix bintray credentials

Author: osipxd

buildSrc/src/main/kotlin/bintray-credentials.gradle.kts

@@ -1,32 +1,8 @@
-import java.util.*
-
-var bintrayUser = "USERNAME_HERE"
-var bintrayApiKey = "API_KEY_HERE"
-
-val isRunningOnCI = System.getenv("CI") == "true"
-if (isRunningOnCI) {
-    bintrayUser = System.getenv("BINTRAY_USER") ?: bintrayUser
-    bintrayApiKey = System.getenv("BINTRAY_API_KEY") ?: bintrayApiKey
-} else {
-    val secretProperties = Properties()
-    val file = rootProject.file("secret.properties")
-
-    if (!file.exists()) {
-        project.logger.log(LogLevel.WARN,
-            """
-            secret.properties not found. Uploading to bintray is unavailable.
-            To make it possible, create the file and fill it with bintray settings.
-            """.trimIndent()
-        )
-    } else file.inputStream().use { stream ->
-        secretProperties.load(stream)
-
-        bintrayUser = secretProperties.getProperty("bintrayUser") ?: error("'bintrayUser' should be specified")
-        bintrayApiKey = secretProperties.getProperty("bintrayApiKey") ?: error("'bintrayApiKey' should be specified")
-    }
-}
-
-allprojects {
-    extra["bintrayUser"] = bintrayUser
-    extra["bintrayApiKey"] = bintrayApiKey
+if (!hasProperty("bintrayUsername") || !hasProperty("bintrayPassword")) {
+    project.logger.log(LogLevel.WARN,
+        """
+        Bintray credentials not found. Uploading to bintray is unavailable.
+        To make it possible, set 'bintrayUsername' and 'bintrayPassword'.
+        """.trimIndent()
+    )
 }

buildSrc/src/main/kotlin/bintray-publish.gradle.kts

@@ -18,8 +18,8 @@ configure<PublishingExtension> {
 }
 
 configure<BintrayExtension> {
-    user = extra["bintrayUser"] as String
-    key = extra["bintrayApiKey"] as String
+    user = (findProperty("bintrayUsername") as? String).orEmpty()
+    key = (findProperty("bintrayPassword") as? String).orEmpty()
     setPublications("maven")
 
     pkg(closureOf<BintrayExtension.PackageConfig> {