diff options
| author | Vadim Mishenev <vad-mishenev@yandex.ru> | 2022-05-31 23:57:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-31 23:57:28 +0300 |
| commit | 73f78dc34bbcb683f345192629bdbc631035887e (patch) | |
| tree | 1ebdd3d0312c3742cfcfc0b199b26fb0d5a57f47 /runners/maven-plugin | |
| parent | 623cf222ca2ac5e8b9628af5927956ecb6d44d1e (diff) | |
| download | dokka-73f78dc34bbcb683f345192629bdbc631035887e.tar.gz dokka-73f78dc34bbcb683f345192629bdbc631035887e.tar.bz2 dokka-73f78dc34bbcb683f345192629bdbc631035887e.zip | |
Bump Kotlin to 1.7.0-RC (#2508)
* `UnresolvedType` is replaced with `ErrorType` in https://github.com/JetBrains/kotlin/commit/b5933c70e20a0dfd788d8d4a6c04ca0d16f7c731
* Support `sig` files in https://github.com/JetBrains/kotlin/commit/22b368849338cae684601c9b1ead31ebb1fd81cf
* `org.jetbrains.kotlin.idea.kdoc.resolveKDocSampleLink` is removed in https://github.com/JetBrains/intellij-community/commit/e4af6f96c8d4e2318d04eddf658a4c4e8c60b2e6
* `org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName` is deprecated
* `org.codehaus.plexus.archiver.AbstractArchiver.addDirectory` is deprecated https://codehaus-plexus.github.io/plexus-archiver/apidocs/org/codehaus/plexus/archiver/Archiver.html#addDirectory-java.io.File-java.lang.String:A-java.lang.String:A-
* Make `clean` independent from `setupMaven`
* Set up JDK classpath roots explicitly
because of https://github.com/JetBrains/kotlin/commit/f89765eb33dd95c8de33a919cca83651b326b246
* Add JPS model and faxml dependencies
* Fix test
* Exclude compiler from buildscript in integration test
* Exclude `com.intellij` package from compiler
* Update kotlin version in integration tests
Diffstat (limited to 'runners/maven-plugin')
| -rw-r--r-- | runners/maven-plugin/build.gradle.kts | 7 | ||||
| -rw-r--r-- | runners/maven-plugin/src/main/kotlin/DokkaMojo.kt | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/runners/maven-plugin/build.gradle.kts b/runners/maven-plugin/build.gradle.kts index 7b3bc649..d62b82dd 100644 --- a/runners/maven-plugin/build.gradle.kts +++ b/runners/maven-plugin/build.gradle.kts @@ -13,9 +13,12 @@ dependencies { implementation(kotlin("stdlib-jdk8")) } +val mavenBuildDir = setupMaven.mavenBuildDir +val mavenBinDir = setupMaven.mavenBinDir + tasks.named<Delete>("clean") { - delete(setupMaven.mavenBuildDir) - delete(setupMaven.mavenBinDir) + delete(mavenBuildDir) + delete(mavenBinDir) } /** diff --git a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt index 94eacdb5..64cf8ee2 100644 --- a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt +++ b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt @@ -17,6 +17,7 @@ import org.apache.maven.project.MavenProjectHelper import org.apache.maven.repository.RepositorySystem import org.codehaus.plexus.archiver.Archiver import org.codehaus.plexus.archiver.jar.JarArchiver +import org.codehaus.plexus.archiver.util.DefaultFileSet import org.codehaus.plexus.util.xml.Xpp3Dom import org.jetbrains.dokka.* import org.jetbrains.dokka.DokkaConfiguration.ExternalDocumentationLink @@ -404,7 +405,7 @@ class DokkaJavadocJarMojo : AbstractDokkaMojo(listOf(javadocDependency)) { val archiver = MavenArchiver() archiver.archiver = jarArchiver archiver.setOutputFile(javadocJar) - archiver.archiver.addDirectory(File(outputDir), arrayOf("**/**"), arrayOf()) + archiver.archiver.addFileSet(DefaultFileSet().apply { directory = File(outputDir) }) archive.isAddMavenDescriptor = false archiver.createArchive(session, mavenProject, archive) |