Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extract classpath from KotlinSharedNativeCompilation as well #2664

Merged
merged 4 commits into from Sep 26, 2022
Merged

Extract classpath from KotlinSharedNativeCompilation as well #2664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fc8267
Extract classpath from `KotlinSharedNativeCompilation` as well
vmishenev Sep 12, 2022
dd6e958
Enhance mpp integration test
vmishenev Sep 21, 2022
a57bcc3
Enable HTMPP for old Kotlin in integration test
vmishenev Sep 21, 2022
e54a1ea
Add comments
vmishenev Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts
View file
Open in desktop
Expand Up @@ -14,6 +14,14 @@ kotlin {
macosX64("macos")
js()
sourceSets {
val commonMain by sourceSets.getting
val linuxMain by sourceSets.getting
val macosMain by sourceSets.getting
val desktopMain by sourceSets.creating {
dependsOn(commonMain)
linuxMain.dependsOn(this)
macosMain.dependsOn(this)
}
named("commonMain") {
dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
Expand All @@ -26,8 +34,8 @@ tasks.withType<DokkaTask>().configureEach {
dokkaSourceSets {
configureEach {
externalDocumentationLink {
url.set(URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/"))
//packageListUrl.set(URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/package-list"))
url.set(URL("https://kotlinlang.org/api/kotlinx.coroutines/"))
//packageListUrl.set(URL("https://kotlinlang.org/api/kotlinx.coroutines/package-list"))
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
View file
Open in desktop
@@ -1 +1,5 @@
dokka_it_kotlin_version=1.7.10
#these flags are enabled by default since 1.6.20.
#remove when this test is executed with Kotlin >= 1.6.20
kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.native.enableDependencyPropagation=false
IgnatBeresnev marked this conversation as resolved.
Show resolved Hide resolved
11 changes: 11 additions & 0 deletions ...ts/gradle/projects/it-multiplatform-0/src/desktopMain/kotlin/it/mpp0/CPointerExtension.kt
View file
Open in desktop
@@ -0,0 +1,11 @@
package it.mpp0

import kotlinx.cinterop.CPointed
import kotlinx.cinterop.CPointer

/**
* Will print the raw value
*/
fun CPointer<CPointed>.customExtension() {
println(this.rawValue)
}
5 changes: 5 additions & 0 deletions ...-tests/gradle/projects/it-multiplatform-0/src/desktopMain/kotlin/it/mpp0/ExpectedClass.kt
View file
Open in desktop
@@ -0,0 +1,5 @@
package it.mpp0

actual class ExpectedClass {
actual val platform: String = "linux"
}
4 changes: 2 additions & 2 deletions ...s/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ import org.gradle.api.file.FileCollection
import org.jetbrains.dokka.gradle.isAndroidTarget
import org.jetbrains.dokka.utilities.cast
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCommonCompilation
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

Expand Down Expand Up @@ -42,7 +42,7 @@ private fun Project.compileClasspathOf(compilation: KotlinCompilation): FileColl
return compilation.compileKotlinTask.cast<KotlinCompile>().classpath
}

val platformDependencyFiles: FileCollection = (compilation as? KotlinNativeCompilation)
val platformDependencyFiles: FileCollection = (compilation as? AbstractKotlinNativeCompilation)
?.target?.project?.configurations
?.findByName(compilation.defaultSourceSet.implementationMetadataConfigurationName)
?: files()
Expand Down