diff options
author | aSemy <897017+aSemy@users.noreply.github.com> | 2023-03-17 15:27:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-17 15:27:03 +0100 |
commit | 8bb4f4a86b131e9740a8074cb5775930f8280019 (patch) | |
tree | 2fea9f93d621d1a2c72129358a45a565cca68e6c /integration-tests/gradle | |
parent | 2a3917b7eb70b39360893b61f5cd7f580c41cfda (diff) | |
download | dokka-8bb4f4a86b131e9740a8074cb5775930f8280019.tar.gz dokka-8bb4f4a86b131e9740a8074cb5775930f8280019.tar.bz2 dokka-8bb4f4a86b131e9740a8074cb5775930f8280019.zip |
Introduce Gradle Version Catalog with type-safe project dependencies (#2884)
Diffstat (limited to 'integration-tests/gradle')
10 files changed, 4 insertions, 34 deletions
diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts index ffc025de..4c7a0398 100644 --- a/integration-tests/gradle/build.gradle.kts +++ b/integration-tests/gradle/build.gradle.kts @@ -5,13 +5,12 @@ plugins { } dependencies { - implementation(project(":integration-tests")) - implementation(kotlin("stdlib")) + implementation(projects.integrationTests) + implementation(kotlin("test-junit")) implementation(gradleTestKit()) - val jsoup_version: String by project - implementation("org.jsoup:jsoup:$jsoup_version") + implementation(libs.jsoup) } tasks.integrationTest { diff --git a/integration-tests/gradle/projects/it-android-0/build.gradle.kts b/integration-tests/gradle/projects/it-android-0/build.gradle.kts index 799ec22d..b19b7ebd 100644 --- a/integration-tests/gradle/projects/it-android-0/build.gradle.kts +++ b/integration-tests/gradle/projects/it-android-0/build.gradle.kts @@ -14,7 +14,5 @@ android { } dependencies { - implementation(kotlin("stdlib")) implementation("androidx.appcompat:appcompat:1.1.0") } - diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts index 44159de0..23f11cbb 100644 --- a/integration-tests/gradle/projects/it-basic/build.gradle.kts +++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts @@ -21,7 +21,6 @@ version = "1.8.10-SNAPSHOT" apply(from = "../template.root.gradle.kts") dependencies { - implementation(kotlin("stdlib")) testImplementation(kotlin("test-junit")) } diff --git a/integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/build.gradle.kts b/integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/build.gradle.kts index 9492fdc8..9f7e98de 100644 --- a/integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/build.gradle.kts +++ b/integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/build.gradle.kts @@ -2,7 +2,3 @@ plugins { kotlin("jvm") id("org.jetbrains.dokka") } - -dependencies { - implementation(kotlin("stdlib")) -} diff --git a/integration-tests/gradle/projects/it-collector-0/moduleA/moduleC/build.gradle.kts b/integration-tests/gradle/projects/it-collector-0/moduleA/moduleC/build.gradle.kts index 9492fdc8..9f7e98de 100644 --- a/integration-tests/gradle/projects/it-collector-0/moduleA/moduleC/build.gradle.kts +++ b/integration-tests/gradle/projects/it-collector-0/moduleA/moduleC/build.gradle.kts @@ -2,7 +2,3 @@ plugins { kotlin("jvm") id("org.jetbrains.dokka") } - -dependencies { - implementation(kotlin("stdlib")) -} diff --git a/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts b/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts index ec366c9d..31c1af84 100644 --- a/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts +++ b/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts @@ -13,10 +13,9 @@ kotlin { } dependencies { - implementation(kotlin("stdlib")) implementation(npm("is-sorted", "1.0.5")) val reactVersion = properties["react_version"] implementation("org.jetbrains.kotlin-wrappers:kotlin-react:$reactVersion") implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:$reactVersion") -}
\ No newline at end of file +} diff --git a/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleB/build.gradle.kts b/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleB/build.gradle.kts index 5f0b69c7..1981701f 100644 --- a/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleB/build.gradle.kts +++ b/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleB/build.gradle.kts @@ -5,10 +5,6 @@ plugins { id("org.jetbrains.dokka") } -dependencies { - implementation(kotlin("stdlib")) -} - tasks.withType<DokkaTask>().configureEach { moduleName.set("!Module B!") dokkaSourceSets.configureEach { diff --git a/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleC/build.gradle.kts b/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleC/build.gradle.kts index e471d375..728e764d 100644 --- a/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleC/build.gradle.kts +++ b/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleC/build.gradle.kts @@ -5,10 +5,6 @@ plugins { id("org.jetbrains.dokka") } -dependencies { - implementation(kotlin("stdlib")) -} - tasks.withType<DokkaTask>().configureEach { dokkaSourceSets.configureEach { includes.from("Module.md") diff --git a/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleD/build.gradle.kts b/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleD/build.gradle.kts index a16e038f..e5edf940 100644 --- a/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleD/build.gradle.kts +++ b/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleD/build.gradle.kts @@ -4,7 +4,3 @@ plugins { kotlin("jvm") id("org.jetbrains.dokka") } - -dependencies { - implementation(kotlin("stdlib")) -} diff --git a/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/build.gradle.kts b/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/build.gradle.kts index f180628f..e84a74a5 100644 --- a/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/build.gradle.kts +++ b/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/build.gradle.kts @@ -18,10 +18,6 @@ buildscript { apply(from = "../template.root.gradle.kts") -dependencies { - implementation(kotlin("stdlib")) -} - fun createTask(name: String) { tasks.register(name, org.jetbrains.dokka.gradle.DokkaTask::class) { dokkaSourceSets { @@ -42,4 +38,3 @@ task("runTasks") { dependsOn ("task_"+i) } } - |