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.

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

Check and add missing dependencies #1816

Merged
merged 4 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 31 additions & 1 deletion kotlin-analysis-api/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import java.io.ByteArrayOutputStream

description = "Kotlin Symbol Processing implementation using Kotlin Analysis API"

Expand All @@ -23,6 +24,7 @@ plugins {
}

val depSourceJars by configurations.creating
val depJarsForCheck by configurations.creating

dependencies {
listOf(
Expand Down Expand Up @@ -84,13 +86,18 @@ dependencies {
) {
isTransitive = false
}
implementation("org.jetbrains:annotations:24.1.0")

compileOnly(project(":common-deps"))

implementation(project(":api"))
implementation(project(":common-util"))

testImplementation(kotlin("stdlib", aaKotlinBaseVersion))

depJarsForCheck("org.jetbrains.kotlin", "kotlin-stdlib", aaKotlinBaseVersion)
depJarsForCheck(project(":api"))
depJarsForCheck(project(":common-deps"))
}

sourceSets.main {
Expand Down Expand Up @@ -121,8 +128,31 @@ tasks.withType<ShadowJar>() {
}
exclude("kotlin/**")
archiveClassifier.set("")
minimize()
minimize {
exclude(dependency("org.lz4:lz4-java:.*"))
}
mergeServiceFiles()

doLast {
// Checks for missing dependencies
val jarJar = archiveFile.get().asFile
val depJars = depJarsForCheck.resolve().map(File::getPath)
val stdout = ByteArrayOutputStream()
try {
exec {
executable = "jdeps"
args = listOf(
"--multi-release", "base",
"--missing-deps",
"-cp", depJars.joinToString(":"), jarJar.path
)
standardOutput = stdout
}
} catch (e: org.gradle.process.internal.ExecException) {
logger.warn(e.message)
}
logger.warn(stdout.toString())
}
}

tasks {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,16 @@ internal val DEAR_SHADOW_JAR_PLEASE_DO_NOT_REMOVE_THESE = listOf(
org.jetbrains.kotlin.load.java.ErasedOverridabilityCondition::class.java,
org.jetbrains.kotlin.load.java.FieldOverridabilityCondition::class.java,
org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInsLoaderImpl::class.java,
com.fasterxml.aalto.AaltoInputProperties::class.java,
com.google.errorprone.annotations.CheckReturnValue::class.java,
com.intellij.openapi.application.JetBrainsProtocolHandler::class.java,
com.intellij.openapi.editor.impl.EditorDocumentPriorities::class.java,
com.intellij.psi.tree.ChildRoleBase::class.java,
com.intellij.util.xmlb.Constants::class.java,
com.intellij.xml.CommonXmlStrings::class.java,
javax.annotation.ParametersAreNonnullByDefault::class.java,
org.codehaus.stax2.XMLInputFactory2::class.java,
org.codehaus.stax2.XMLStreamProperties::class.java,
)

fun TargetPlatform.getPlatformInfo(kspConfig: KSPConfig): List<PlatformInfo> =
Expand Down