erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-25 16:07:12 -07:00
Code Releases Activity

Fix the bogus default value for getProperty().

Browse source
This commit is contained in:
Cedric Beust 2017-05-10 09:52:24 -07:00
parent 75fbfb9613
commit a47b570d16
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/GithubApi2.kt
View file

@ -120,8 +120,8 @@ class GithubApi2 @Inject constructor(
Duration.between(VersionCheckTimestampFile.timestamp, Instant.now())) { Duration.between(VersionCheckTimestampFile.timestamp, Instant.now())) {
kobaltLog(2, "Skipping GitHub latest release check, too soon.") kobaltLog(2, "Skipping GitHub latest release check, too soon.")
} else { } else {
val username = localProperties.getNoThrows(PROPERTY_USERNAME, DOC_URL) val username = localProperties.getNoThrows(PROPERTY_USERNAME)
val accessToken = localProperties.getNoThrows(PROPERTY_ACCESS_TOKEN, DOC_URL) val accessToken = localProperties.getNoThrows(PROPERTY_ACCESS_TOKEN)
try { try {
val req = val req =
if (username != null && accessToken != null) { if (username != null && accessToken != null) {

4
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/LocalProperties.kt
View file

@ -25,10 +25,10 @@ class LocalProperties {
result result
} }
fun getNoThrows(name: String, docUrl: String? = null): String? = localProperties.getProperty(name, docUrl) fun getNoThrows(name: String): String? = localProperties.getProperty(name)
fun get(name: String, docUrl: String? = null) : String { fun get(name: String, docUrl: String? = null) : String {
val result = getNoThrows(name, docUrl) val result = getNoThrows(name)
?: throw KobaltException("Couldn't find $name in local.properties", docUrl = docUrl) ?: throw KobaltException("Couldn't find $name in local.properties", docUrl = docUrl)
return result return result
} }

2
src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
View file

@ -117,7 +117,7 @@ class PublishPlugin @Inject constructor(val files: KFiles, val factory: PomGener
val docUrl = DocUrl.PUBLISH_PLUGIN_URL val docUrl = DocUrl.PUBLISH_PLUGIN_URL
val user = localProperties.get(PROPERTY_BINTRAY_USER, docUrl) val user = localProperties.get(PROPERTY_BINTRAY_USER, docUrl)
val password = localProperties.get(PROPERTY_BINTRAY_PASSWORD, docUrl) val password = localProperties.get(PROPERTY_BINTRAY_PASSWORD, docUrl)
val org = localProperties.getNoThrows(PROPERTY_BINTRAY_ORG, docUrl) val org = localProperties.getNoThrows(PROPERTY_BINTRAY_ORG)
val jcenter = bintrayFactory.create(user, password, org) val jcenter = bintrayFactory.create(user, password, org)
var success = false var success = false