azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove KDoc support in Kotlin Gradle plugin

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-03-20 16:07:21 +01:00
parent 811f75f062
commit 649287b689
9 changed files with 0 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/pom.xml
-6
View File
@@ -37,12 +37,6 @@
<version>2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kdoc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-gradle-plugin-core</artifactId>
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
-18
View File
@@ -247,7 +247,6 @@ abstract class AbstractKotlinPlugin @Inject constructor(val scriptHandler: Scrip
project.getPlugins().apply(javaClass<JavaPlugin>())
configureSourceSetDefaults(project as ProjectInternal, javaBasePlugin, javaPluginConvention)
configureKDoc(project, javaPluginConvention)
val gradleUtils = GradleUtils(scriptHandler, project)
project.getExtensions().add(DEFAULT_ANNOTATIONS, gradleUtils.resolveKotlinPluginDependency("kotlin-jdk-annotations"))
@@ -262,23 +261,6 @@ abstract class AbstractKotlinPlugin @Inject constructor(val scriptHandler: Scrip
}
})
}
open protected fun configureKDoc(project: Project, javaPluginConvention: JavaPluginConvention) {
val mainSourceSet = javaPluginConvention.getSourceSets()?.findByName(SourceSet.MAIN_SOURCE_SET_NAME) as HasConvention?
if (mainSourceSet != null) {
val kdoc = tasksProvider.createKDocTask(project, KDOC_TASK_NAME)
kdoc.setDescription("Generates KDoc API documentation for the main source code.")
kdoc.setGroup(JavaBasePlugin.DOCUMENTATION_GROUP)
kdoc.setSource(mainSourceSet.getConvention().getExtensionsAsDynamicObject().getProperty("kotlin"))
}
project.getTasks().withType(tasksProvider.kDocTaskClass) { it!!.setProperty("destinationDir", File(javaPluginConvention.getDocsDir(), "kdoc")) }
}
public val KDOC_TASK_NAME: String = "kdoc"
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt
-7
View File
@@ -19,9 +19,6 @@ public open class KotlinTasksProvider(val tasksLoader: ClassLoader) {
val kotlinJSCompileTaskClass: Class<AbstractCompile> =
tasksLoader.loadClass("org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile") as Class<AbstractCompile>
val kDocTaskClass: Class<SourceTask> =
tasksLoader.loadClass("org.jetbrains.kotlin.gradle.tasks.KDoc") as Class<SourceTask>
val kotlinJVMOptionsClass: Class<Any> =
tasksLoader.loadClass("org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments") as Class<Any>
@@ -33,8 +30,4 @@ public open class KotlinTasksProvider(val tasksLoader: ClassLoader) {
public fun createKotlinJSTask(project: Project, name: String): AbstractCompile {
return project.getTasks().create(name, kotlinJSCompileTaskClass)
}
public fun createKDocTask(project: Project, name: String): SourceTask {
return project.getTasks().create(name, kDocTaskClass)
}
}
libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt
-8
View File
@@ -66,14 +66,6 @@ class SimpleKotlinGradleIT : BaseGradleIT() {
}
}
Test fun testSimpleKDoc() {
Project("kdocProject", "1.6").build("kdoc") {
assertSuccessful()
assertReportExists("build/docs/kdoc/demo/MyClass.html")
assertContains(":kdoc", "Generating kdoc to")
}
}
Test fun testKotlinExtraJavaSrc() {
Project("additionalJavaSrc", "1.6").build("build") {
assertSuccessful()
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kdocProject/build.gradle
-40
View File
@@ -1,40 +0,0 @@
buildscript {
repositories {
mavenCentral()
maven {
url 'file://' + pathToKotlinPlugin
}
}
dependencies {
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT'
}
}
apply plugin: "kotlin"
repositories {
maven {
url 'file://' + pathToKotlinPlugin
}
mavenCentral()
}
dependencies {
testCompile 'org.testng:testng:6.8'
compile 'org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT'
}
test {
useTestNG()
}
compileKotlin {
kotlinOptions.annotations = "externalAnnotations"
}
task wrapper(type: Wrapper) {
gradleVersion="1.4"
}
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kdocProject/externalAnnotations/com/google/common/base/annotations.xml
-11
View File
@@ -1,11 +0,0 @@
<root>
<item name='com.google.common.base.Joiner com.google.common.base.Joiner on(java.lang.String)'>
<annotation name="org.jetbrains.annotations.NotNull" />
</item>
<item name='com.google.common.base.Joiner com.google.common.base.Joiner.MapJoiner withKeyValueSeparator(java.lang.String)'>
<annotation name="org.jetbrains.annotations.NotNull" />
</item>
<item name='com.google.common.base.Joiner com.google.common.base.Joiner skipNulls()'>
<annotation name="org.jetbrains.annotations.NotNull" />
</item>
</root>
libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kdocProject/src/main/kotlin/helloWorld.kt
-15
View File
@@ -1,15 +0,0 @@
package demo
/**
* This is **bold**
*
* New paragraph using newlines.
*
* We can also support wiki links notation
* for example [[List]] and [[Collection]] and [[java.util.Collection.size()]] will
* generate hypertext links to classes
*/
public class MyClass() {
val i: Int = 0
}