From 48bbdfd1ff13ad8f554970115c5708fe1c4c698a Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 19 Jan 2017 13:32:50 -0800 Subject: [PATCH] Remove public. --- .../src/main/kotlin/com/beust/kobalt/Directives.kt | 2 +- .../com/beust/kobalt/kotlin/ParentLastClassLoader.kt | 8 ++++---- .../kotlin/com/beust/kobalt/maven/CompletedFuture.kt | 2 +- .../src/main/kotlin/com/beust/kobalt/maven/Gpg.kt | 2 +- .../src/main/kotlin/com/beust/kobalt/maven/LocalDep.kt | 2 +- .../src/main/kotlin/com/beust/kobalt/misc/JarUtils.kt | 4 ++-- .../src/main/kotlin/com/beust/kobalt/misc/Node.kt | 8 ++++---- .../kotlin/com/beust/kobalt/app/BuildFileCompiler.kt | 2 +- src/main/kotlin/com/beust/kobalt/app/MainModule.kt | 2 +- .../kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt | 2 +- src/test/kotlin/com/beust/kobalt/KobaltTest.kt | 2 +- .../kotlin/com/beust/kobalt/maven/DependencyTest.kt | 6 +++--- src/test/kotlin/com/beust/kobalt/maven/JUnitTest.kt | 10 ---------- 13 files changed, 21 insertions(+), 31 deletions(-) delete mode 100644 src/test/kotlin/com/beust/kobalt/maven/JUnitTest.kt diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt index a655325a..ef96a5f1 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt @@ -6,7 +6,7 @@ import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.internal.JvmCompilerPlugin @Directive -public fun project(vararg projects: Project, init: Project.() -> Unit): Project { +fun project(vararg projects: Project, init: Project.() -> Unit): Project { return Project("").apply { init() (Kobalt.findPlugin(JvmCompilerPlugin.PLUGIN_NAME) as JvmCompilerPlugin) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/kotlin/ParentLastClassLoader.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/kotlin/ParentLastClassLoader.kt index 10269d52..ff04cb67 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/kotlin/ParentLastClassLoader.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/kotlin/ParentLastClassLoader.kt @@ -9,7 +9,7 @@ import java.net.URLClassLoader * Will probably be made obsolete by making the wrapper a standalone module instead of * being inside Kobalt itself. */ -public class ParentLastClassLoader(val classpath: List) +class ParentLastClassLoader(val classpath: List) : ClassLoader(Thread.currentThread().contextClassLoader) { private val childClassLoader: ChildURLClassLoader @@ -22,7 +22,7 @@ public class ParentLastClassLoader(val classpath: List) * This class makes it possible to call findClass on a classloader */ private class FindClassClassLoader(parent: ClassLoader) : ClassLoader(parent) { - override public fun findClass(name: String) = super.findClass(name) + override fun findClass(name: String) = super.findClass(name) } /** @@ -32,7 +32,7 @@ public class ParentLastClassLoader(val classpath: List) private class ChildURLClassLoader(urls: Array, val realParent: FindClassClassLoader) : URLClassLoader(urls, null) { - override public fun findClass(name: String) : Class<*> { + override fun findClass(name: String) : Class<*> { try { // first try to use the URLClassLoader findClass return super.findClass(name) @@ -43,7 +43,7 @@ public class ParentLastClassLoader(val classpath: List) } } - override public @Synchronized fun loadClass(name: String, resolve: Boolean) : Class<*> { + override @Synchronized fun loadClass(name: String, resolve: Boolean) : Class<*> { try { // first we try to find a class inside the child classloader return childClassLoader.findClass(name) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/CompletedFuture.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/CompletedFuture.kt index f64c32b5..1e24cd8e 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/CompletedFuture.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/CompletedFuture.kt @@ -3,7 +3,7 @@ package com.beust.kobalt.maven import java.util.concurrent.Future import java.util.concurrent.TimeUnit -public class CompletedFuture(val value: T) : Future { +class CompletedFuture(val value: T) : Future { override fun cancel(mayInterruptIfRunning: Boolean) = true override fun get(): T = value override fun get(timeout: Long, unit: TimeUnit): T = value diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Gpg.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Gpg.kt index 7ba988c5..27eeee83 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Gpg.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Gpg.kt @@ -10,7 +10,7 @@ import java.io.File import java.io.InputStreamReader @Singleton -public class Gpg { +class Gpg { val COMMANDS = listOf("gpg", "gpg2") fun findGpgCommand() : String? { diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/LocalDep.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/LocalDep.kt index baebac31..53cb1c89 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/LocalDep.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/LocalDep.kt @@ -1,6 +1,6 @@ package com.beust.kobalt.maven -open public class LocalDep(override val mavenId: MavenId, open val localRepo: LocalRepo) +open class LocalDep(override val mavenId: MavenId, open val localRepo: LocalRepo) : SimpleDep(mavenId) { fun toAbsoluteJarFilePath(v: String) = localRepo.toFullPath(toJarFile(v)) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/JarUtils.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/JarUtils.kt index 39091228..807a6aba 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/JarUtils.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/JarUtils.kt @@ -12,7 +12,7 @@ import java.util.zip.ZipEntry import java.util.zip.ZipFile import java.util.zip.ZipOutputStream -public class JarUtils { +class JarUtils { companion object { val DEFAULT_HANDLER: (Exception) -> Unit = { ex: Exception -> // Ignore duplicate entry exceptions @@ -150,7 +150,7 @@ class IncludedFile(val fromOriginal: From, val toOriginal: To, val specs: List(val value: T) { +data class Node(val value: T) { val children = arrayListOf>() var parent: Node? = null - public fun addChildren(values: List>) { + fun addChildren(values: List>) { values.forEach { it.parent = this children.add(it) @@ -15,12 +15,12 @@ public data class Node(val value: T) { println(s) } - public fun dump(r: T, children: List>, indent: Int) { + fun dump(r: T, children: List>, indent: Int) { p(" ".repeat(indent) + r) children.forEach { dump(it.value, it.children, indent + 2) } } - public fun dump(indent: Int = 0) { + fun dump(indent: Int = 0) { dump(value, children, indent) } } diff --git a/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt b/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt index a03cae12..3df6eadc 100644 --- a/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt @@ -32,7 +32,7 @@ import javax.inject.Inject * 1) Extract the repos() and plugins() statements in a separate .kt and compile it into preBuildScript.jar. * 2) Actually build the whole Build.kt file after adding to the classpath whatever phase 1 found (plugins, repos) */ -public class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val buildFiles: List, +class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val buildFiles: List, @Assisted val pluginInfo: PluginInfo, val files: KFiles, val plugins: Plugins, val dependencyManager: DependencyManager, val pluginProperties: PluginProperties, val executors: KobaltExecutors, val buildScriptUtil: BuildScriptUtil, val settings: KobaltSettings, diff --git a/src/main/kotlin/com/beust/kobalt/app/MainModule.kt b/src/main/kotlin/com/beust/kobalt/app/MainModule.kt index 08403324..67ad96b1 100644 --- a/src/main/kotlin/com/beust/kobalt/app/MainModule.kt +++ b/src/main/kotlin/com/beust/kobalt/app/MainModule.kt @@ -65,7 +65,7 @@ open class MainModule(val args: Args, val settings: KobaltSettings) : AbstractMo // bindListener(Matchers.any(), object: TypeListener { // override fun hear(typeLiteral: TypeLiteral?, typeEncounter: TypeEncounter?) { // val bean = object: InjectionListener { -// override public fun afterInjection(injectee: I) { +// override fun afterInjection(injectee: I) { // if (Scopes.isCircularProxy(injectee)) { // println("CYCLE: " + typeLiteral?.getRawType()?.getName()); // } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt index c10245bc..62546286 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt @@ -72,7 +72,7 @@ class JavaPlugin @Inject constructor(val javaCompiler: JavaCompiler, override va } @Directive -public fun javaProject(vararg projects: Project, init: Project.() -> Unit): Project { +fun javaProject(vararg projects: Project, init: Project.() -> Unit): Project { return Project().apply { warn("javaProject{} is deprecated, please use project{}") init() diff --git a/src/test/kotlin/com/beust/kobalt/KobaltTest.kt b/src/test/kotlin/com/beust/kobalt/KobaltTest.kt index 5c09efbf..913cc35a 100644 --- a/src/test/kotlin/com/beust/kobalt/KobaltTest.kt +++ b/src/test/kotlin/com/beust/kobalt/KobaltTest.kt @@ -8,7 +8,7 @@ import org.testng.annotations.Guice open class KobaltTest { companion object { @BeforeSuite - public fun bs() { + fun bs() { Kobalt.INJECTOR = com.google.inject.Guice.createInjector(TestModule()) } } diff --git a/src/test/kotlin/com/beust/kobalt/maven/DependencyTest.kt b/src/test/kotlin/com/beust/kobalt/maven/DependencyTest.kt index adc7096f..f52f9518 100644 --- a/src/test/kotlin/com/beust/kobalt/maven/DependencyTest.kt +++ b/src/test/kotlin/com/beust/kobalt/maven/DependencyTest.kt @@ -29,17 +29,17 @@ class DependencyTest @Inject constructor(val executors: KobaltExecutors) { private var executor: ExecutorService by Delegates.notNull() @BeforeClass - public fun bc() { + fun bc() { executor = executors.newExecutor("DependencyTest", 5) } @AfterClass - public fun ac() { + fun ac() { executor.shutdown() } @Test(dataProvider = "dpVersions") - public fun versionSorting(k: String, v: String) { + fun versionSorting(k: String, v: String) { val dep1 = Versions.toLongVersion(k) val dep2 = Versions.toLongVersion(v) Assert.assertTrue(dep1.compareTo(dep2) < 0) diff --git a/src/test/kotlin/com/beust/kobalt/maven/JUnitTest.kt b/src/test/kotlin/com/beust/kobalt/maven/JUnitTest.kt deleted file mode 100644 index 1d0532f8..00000000 --- a/src/test/kotlin/com/beust/kobalt/maven/JUnitTest.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.beust.kobalt.maven - -//import org.junit.Test -// -//public class JUnitTest { -// @Test -// public fun simpleTestForJUnit() { -// println("Works") -// } -//}