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

Merge pull request #13 from benignbala/master

Browse source 
Move OperatingSystem.kt from under the java plugin to top level.
This commit is contained in:
Cedric Beust 2015-10-08 10:07:20 -07:00
commit 5983e444fd
14 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/com/beust/kobalt/BuildScript.kt
View file

@ -6,7 +6,7 @@ import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.maven.DepFactory import com.beust.kobalt.maven.DepFactory
import com.beust.kobalt.maven.IClasspathDependency import com.beust.kobalt.maven.IClasspathDependency
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.plugin.java.SystemProperties import com.beust.kobalt.SystemProperties
import java.io.File import java.io.File
@Directive @Directive

4
src/main/kotlin/com/beust/kobalt/plugin/java/JavaInfo.kt → src/main/kotlin/com/beust/kobalt/JavaInfo.kt
View file

@ -1,4 +1,6 @@
package com.beust.kobalt.plugin.java package com.beust.kobalt
import com.beust.kobalt.OperatingSystem
import java.io.File import java.io.File

5
src/main/kotlin/com/beust/kobalt/plugin/java/Jvm.kt → src/main/kotlin/com/beust/kobalt/Jvm.kt
View file

@ -1,13 +1,14 @@
package com.beust.kobalt.plugin.java package com.beust.kobalt
import com.beust.kobalt.misc.KobaltLogger import com.beust.kobalt.misc.KobaltLogger
import com.beust.kobalt.maven.KobaltException import com.beust.kobalt.maven.KobaltException
import com.beust.kobalt.OperatingSystem
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
import java.util.HashMap import java.util.HashMap
public open class Jvm constructor( public open class Jvm constructor(
val os: com.beust.kobalt.plugin.java.OperatingSystem, val os: com.beust.kobalt.OperatingSystem,
var javaBase: File? = null) : JavaInfo(), KobaltLogger { var javaBase: File? = null) : JavaInfo(), KobaltLogger {
private var _javaHome: File? = null private var _javaHome: File? = null

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

@ -8,7 +8,7 @@ import com.beust.kobalt.kotlin.BuildFile
import com.beust.kobalt.kotlin.ScriptCompiler import com.beust.kobalt.kotlin.ScriptCompiler
import com.beust.kobalt.maven.* import com.beust.kobalt.maven.*
import com.beust.kobalt.misc.* import com.beust.kobalt.misc.*
import com.beust.kobalt.plugin.java.SystemProperties import com.beust.kobalt.SystemProperties
import com.beust.kobalt.plugin.publish.JCenterApi import com.beust.kobalt.plugin.publish.JCenterApi
import com.beust.kobalt.plugin.publish.UnauthenticatedJCenterApi import com.beust.kobalt.plugin.publish.UnauthenticatedJCenterApi
import com.beust.kobalt.wrapper.Wrapper import com.beust.kobalt.wrapper.Wrapper

2
src/main/kotlin/com/beust/kobalt/plugin/java/OperatingSystem.kt → src/main/kotlin/com/beust/kobalt/OperatingSystem.kt
View file

@ -1,4 +1,4 @@
package com.beust.kobalt.plugin.java package com.beust.kobalt
import java.io.File import java.io.File
import java.util.* import java.util.*

2
src/main/kotlin/com/beust/kobalt/plugin/java/SystemProperties.kt → src/main/kotlin/com/beust/kobalt/SystemProperties.kt
View file

@ -1,4 +1,4 @@
package com.beust.kobalt.plugin.java package com.beust.kobalt
import java.util.concurrent.locks.ReentrantLock import java.util.concurrent.locks.ReentrantLock
import javax.inject.Inject import javax.inject.Inject

4
src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt
View file

@ -4,8 +4,8 @@ import com.beust.kobalt.api.Project
import com.beust.kobalt.maven.IClasspathDependency import com.beust.kobalt.maven.IClasspathDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltLogger import com.beust.kobalt.misc.KobaltLogger
import com.beust.kobalt.plugin.java.JavaInfo import com.beust.kobalt.JavaInfo
import com.beust.kobalt.plugin.java.SystemProperties import com.beust.kobalt.SystemProperties
import java.io.File import java.io.File
abstract class GenericTestRunner(open val project: Project, open val classpath: List<IClasspathDependency>) abstract class GenericTestRunner(open val project: Project, open val classpath: List<IClasspathDependency>)

4
src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt
View file

@ -4,8 +4,8 @@ import com.beust.kobalt.api.Project
import com.beust.kobalt.maven.IClasspathDependency import com.beust.kobalt.maven.IClasspathDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltLogger import com.beust.kobalt.misc.KobaltLogger
import com.beust.kobalt.plugin.java.JavaInfo import com.beust.kobalt.JavaInfo
import com.beust.kobalt.plugin.java.SystemProperties import com.beust.kobalt.SystemProperties
import java.io.File import java.io.File
public class JUnitRunner(override val project: Project, override val classpath: List<IClasspathDependency>) public class JUnitRunner(override val project: Project, override val classpath: List<IClasspathDependency>)

4
src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt
View file

@ -4,8 +4,8 @@ import com.beust.kobalt.api.Project
import com.beust.kobalt.maven.IClasspathDependency import com.beust.kobalt.maven.IClasspathDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltLogger import com.beust.kobalt.misc.KobaltLogger
import com.beust.kobalt.plugin.java.JavaInfo import com.beust.kobalt.JavaInfo
import com.beust.kobalt.plugin.java.SystemProperties import com.beust.kobalt.SystemProperties
import java.io.File import java.io.File
import java.util.* import java.util.*

2
src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt
View file

@ -3,7 +3,7 @@ package com.beust.kobalt.maven
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltLogger import com.beust.kobalt.misc.KobaltLogger
import com.beust.kobalt.misc.Versions import com.beust.kobalt.misc.Versions
import com.beust.kobalt.plugin.java.SystemProperties import com.beust.kobalt.SystemProperties
import java.io.File import java.io.File
import java.util.Collections import java.util.Collections
import javax.inject.Inject import javax.inject.Inject

2
src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt
View file

@ -2,7 +2,7 @@ package com.beust.kobalt.maven
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.misc.KobaltLogger import com.beust.kobalt.misc.KobaltLogger
import com.beust.kobalt.plugin.java.SystemProperties import com.beust.kobalt.SystemProperties
import com.google.common.base.Preconditions import com.google.common.base.Preconditions
import com.google.inject.assistedinject.Assisted import com.google.inject.assistedinject.Assisted
import org.apache.maven.model.Developer import org.apache.maven.model.Developer

2
src/main/kotlin/com/beust/kobalt/misc/KFiles.kt
View file

@ -4,7 +4,7 @@ import com.beust.kobalt.api.Kobalt
import com.beust.kobalt.homeDir import com.beust.kobalt.homeDir
import com.beust.kobalt.kotlin.BuildFile import com.beust.kobalt.kotlin.BuildFile
import com.beust.kobalt.maven.KobaltException import com.beust.kobalt.maven.KobaltException
import com.beust.kobalt.plugin.java.SystemProperties import com.beust.kobalt.SystemProperties
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
import java.io.InputStream import java.io.InputStream

3
src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
View file

@ -11,6 +11,9 @@ import com.beust.kobalt.maven.*
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.KobaltLogger import com.beust.kobalt.misc.KobaltLogger
import com.beust.kobalt.JavaInfo
import com.beust.kobalt.Jvm
import com.beust.kobalt.SystemProperties
import java.io.File import java.io.File
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton

4
src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt
View file

@ -4,8 +4,8 @@ import com.beust.kobalt.maven.Http
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltLogger import com.beust.kobalt.misc.KobaltLogger
import com.beust.kobalt.misc.benchmark import com.beust.kobalt.misc.benchmark
import com.beust.kobalt.plugin.java.JavaInfo import com.beust.kobalt.JavaInfo
import com.beust.kobalt.plugin.java.SystemProperties import com.beust.kobalt.SystemProperties
import java.io.File import java.io.File
import java.io.FileReader import java.io.FileReader
import java.io.IOException import java.io.IOException