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

Use injection for isDev.

Browse source
This commit is contained in:
Cedric Beust 2017-04-01 06:22:17 -07:00
parent a749dbf9b6
commit b3ce6db1da
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,8 @@ import java.util.concurrent.Callable
import java.util.concurrent.Future import java.util.concurrent.Future
class GithubApi2 @Inject constructor( class GithubApi2 @Inject constructor(
val executors: KobaltExecutors, val localProperties: LocalProperties, val http: Http, val settings:KobaltSettings) { val executors: KobaltExecutors, val localProperties: LocalProperties, val http: Http,
val settings:KobaltSettings, val args: Args) {
companion object { companion object {
const val PROPERTY_ACCESS_TOKEN = "github.accessToken" const val PROPERTY_ACCESS_TOKEN = "github.accessToken"
@ -110,13 +111,11 @@ class GithubApi2 @Inject constructor(
return Observable.just(UploadAssetResponse(tagName, tagName)) return Observable.just(UploadAssetResponse(tagName, tagName))
} }
var isDev: Boolean = false
val latestKobaltVersion: Future<String> val latestKobaltVersion: Future<String>
get() { get() {
val callable = Callable<String> { val callable = Callable<String> {
var result = Kobalt.version var result = Kobalt.version
if (! isDev && Duration.ofMinutes(10L) > if (! args.isDev && Duration.ofMinutes(10L) >
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 {

1
src/main/kotlin/com/beust/kobalt/Main.kt
View file

@ -94,7 +94,6 @@ private class Main @Inject constructor(
var result = 1 var result = 1
github.isDev = args.dev
val latestVersionFuture = github.latestKobaltVersion val latestVersionFuture = github.latestKobaltVersion
try { try {