diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index fe643816..f4113960 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -62,6 +62,7 @@ val kobalt = kotlinProject(wrapper) { "org.jsoup:jsoup:1.8.3", "com.google.inject:guice:4.0", "com.google.inject.extensions:guice-assistedinject:4.0", + "javax.inject:javax.inject:1", "com.google.guava:guava:19.0-rc2", "org.apache.maven:maven-model:3.3.3", "com.github.spullara.mustache.java:compiler:0.9.1", diff --git a/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt b/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt index 50261b2c..35b0465d 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/remote/GetDependenciesCommand.kt @@ -9,7 +9,7 @@ import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.log import com.google.gson.Gson import com.google.gson.JsonObject -import com.google.inject.Inject +import javax.inject.Inject import java.nio.file.Paths /** diff --git a/src/main/kotlin/com/beust/kobalt/internal/remote/KobaltClient.kt b/src/main/kotlin/com/beust/kobalt/internal/remote/KobaltClient.kt index ed42c8c5..0755457d 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/remote/KobaltClient.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/remote/KobaltClient.kt @@ -8,7 +8,7 @@ import com.beust.kobalt.misc.log import com.google.gson.Gson import com.google.gson.JsonObject import com.google.gson.JsonParser -import com.google.inject.Inject +import javax.inject.Inject import java.io.BufferedReader import java.io.BufferedWriter import java.io.InputStreamReader diff --git a/src/main/kotlin/com/beust/kobalt/internal/remote/KobaltServer.kt b/src/main/kotlin/com/beust/kobalt/internal/remote/KobaltServer.kt index 6cd8ed2b..23cdcdc7 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/remote/KobaltServer.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/remote/KobaltServer.kt @@ -6,7 +6,7 @@ import com.beust.kobalt.misc.log import com.google.gson.Gson import com.google.gson.JsonObject import com.google.gson.JsonParser -import com.google.inject.Inject +import javax.inject.Inject import com.google.inject.Singleton import java.io.BufferedReader import java.io.InputStreamReader diff --git a/src/main/kotlin/com/beust/kobalt/misc/CheckVersions.kt b/src/main/kotlin/com/beust/kobalt/misc/CheckVersions.kt index 7056d707..c8ed957a 100644 --- a/src/main/kotlin/com/beust/kobalt/misc/CheckVersions.kt +++ b/src/main/kotlin/com/beust/kobalt/misc/CheckVersions.kt @@ -4,7 +4,7 @@ import com.beust.kobalt.api.Kobalt import com.beust.kobalt.api.Project import com.beust.kobalt.maven.DepFactory import com.beust.kobalt.maven.MavenDependency -import com.google.inject.Inject +import javax.inject.Inject /** * Find out if any newer versions of the dependencies are available. diff --git a/src/main/kotlin/com/beust/kobalt/misc/GithubApi.kt b/src/main/kotlin/com/beust/kobalt/misc/GithubApi.kt index 627bb7ab..73a51688 100644 --- a/src/main/kotlin/com/beust/kobalt/misc/GithubApi.kt +++ b/src/main/kotlin/com/beust/kobalt/misc/GithubApi.kt @@ -3,7 +3,7 @@ package com.beust.kobalt.misc import com.google.gson.JsonArray import com.google.gson.JsonObject import com.google.gson.JsonParser -import com.google.inject.Inject +import javax.inject.Inject import java.io.BufferedReader import java.io.IOException import java.io.InputStreamReader diff --git a/src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt b/src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt index 773d1e23..d07d1f98 100644 --- a/src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt +++ b/src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt @@ -1,7 +1,7 @@ package com.beust.kobalt.misc import com.beust.kobalt.maven.Http -import com.google.inject.Inject +import javax.inject.Inject import java.io.File /**