diff options
| author | sebastian.sellmair <sebastian.sellmair@jetbrains.com> | 2020-06-15 18:13:35 +0200 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-07-07 14:31:17 +0200 |
| commit | 90459de7b6fce28a8ba57aca5eb213575204bc3d (patch) | |
| tree | d2ccba1413fbc4de034aaca20f11bf05e39b4ec7 /integration-tests | |
| parent | 14b9352b9b7a4084f72209ba686170e313f7863b (diff) | |
| download | dokka-90459de7b6fce28a8ba57aca5eb213575204bc3d.tar.gz dokka-90459de7b6fce28a8ba57aca5eb213575204bc3d.tar.bz2 dokka-90459de7b6fce28a8ba57aca5eb213575204bc3d.zip | |
Update to Kotlin 1.4 M3
Diffstat (limited to 'integration-tests')
| -rw-r--r-- | integration-tests/cli/build.gradle.kts | 7 | ||||
| -rw-r--r-- | integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleIntegrationTest.kt | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/integration-tests/cli/build.gradle.kts b/integration-tests/cli/build.gradle.kts index f825a148..5fdf0ff5 100644 --- a/integration-tests/cli/build.gradle.kts +++ b/integration-tests/cli/build.gradle.kts @@ -19,7 +19,12 @@ dependencies { } /* Create a fat base plugin jar for cli tests */ -val basePluginShadow: Configuration by configurations.creating +val basePluginShadow: Configuration by configurations.creating { + attributes { + attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage::class.java, "java-runtime")) + } +} + dependencies { basePluginShadow(project(":plugins:base")) } diff --git a/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleIntegrationTest.kt b/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleIntegrationTest.kt index f2dece62..2ba49a5a 100644 --- a/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleIntegrationTest.kt @@ -42,4 +42,3 @@ abstract class AbstractGradleIntegrationTest : AbstractIntegrationTest() { .withJvmArguments("-Xmx4G", "-XX:MaxMetaspaceSize=1G") } } - |