diff options
| author | Ting-Yuan Huang <laszio@google.com> | 2024-02-21 15:06:13 -0800 |
|---|---|---|
| committer | KSP Auto Pick <kotlin-symbol-processing@google.com> | 2024-02-22 01:14:17 +0000 |
| commit | 9067ae078bdfa967db6f8f5acd8af1590af0ed33 (patch) | |
| tree | 02fb2d7a53b33b3bb19f2e194c1c9e65b05f5181 | |
| parent | 48329b07d1dab1337ace47a7516da39527c34174 (diff) | |
| download | ksp-9067ae078bdfa967db6f8f5acd8af1590af0ed33.tar.gz | |
KSP2: Rename common-util in the embeddable
(cherry picked from commit 86f0b6a2a55e96600d4027cfc58072dc6984103d)
| -rw-r--r-- | symbol-processing-aa-embeddable/build.gradle.kts | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/symbol-processing-aa-embeddable/build.gradle.kts b/symbol-processing-aa-embeddable/build.gradle.kts index 36964fd9..3836f338 100644 --- a/symbol-processing-aa-embeddable/build.gradle.kts +++ b/symbol-processing-aa-embeddable/build.gradle.kts @@ -33,6 +33,7 @@ val prefixesToRelocate = listOf( "org.codehaus.", "com.github.benmanes.caffeine.", "com.google.common.", + "com.google.devtools.ksp.common.", "com.google.errorprone.", "com.google.gwt.", "com.google.j2objc.", @@ -79,8 +80,13 @@ tasks.withType<ShadowJar> { } } +val prefixesToRelocateStripped = prefixesToRelocate.map { + Pair(it.first.trim('.'), it.second.trim('.')) +} + +// TODO: match with Trie fun String.replaceWithKsp() = - prefixesToRelocate.fold(this) { acc, (f, t) -> + prefixesToRelocateStripped.fold(this) { acc, (f, t) -> acc.replace("package $f", "package $t") .replace("import $f", "import $t") } @@ -131,6 +137,7 @@ tasks { project(":kotlin-analysis-api").configurations.getByName("depSourceJars").resolve().forEach { from(zipTree(it)) } + from(project(":common-util").sourceSets.main.get().allSource) into("$DEP_SOURCES_DIR/ksp") } val sourcesJar by creating(Jar::class) { @@ -138,7 +145,6 @@ tasks { duplicatesStrategy = DuplicatesStrategy.EXCLUDE archiveClassifier.set("sources") from(project(":kotlin-analysis-api").sourceSets.main.get().allSource) - from(project(":common-util").sourceSets.main.get().allSource) from(DEP_SOURCES_DIR) filter { it.replaceWithKsp() } } |