MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[workspace model] IDEA-297350 Migrate to intellij-dependencies repository and use dependency to codegen-api from it

Browse Source 
GitOrigin-RevId: 8a0ab91361b432a7d495fce975d8f5791184fd1f
This commit is contained in:
Mikhail Mazurkevich
2023-03-22 15:46:14 +00:00
committed by intellij-monorepo-bot
parent 52a9e46511
commit 0895a246f8
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/workspace_model_codegen.xml
Generated
+2 -2
View File
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="workspace-model-codegen" type="repository">
<properties include-transitive-deps="false" maven-id="com.jetbrains.intellij.platform:workspace-model-codegen:0.0.4" />
<properties include-transitive-deps="false" maven-id="com.jetbrains.intellij.platform:workspace-model-codegen:0.0.1" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/platform/workspace-model-codegen/0.0.4/workspace-model-codegen-0.0.4.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/intellij/platform/workspace-model-codegen/0.0.1/workspace-model-codegen-0.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
platform/workspaceModel/codegen-impl/build.gradle.kts
+6 -2
View File
@@ -15,10 +15,14 @@ repositories {
url = uri("https://www.jetbrains.com/intellij-repository/releases")
}
maven {
url = uri("https://www.jetbrains.com/intellij-repository/nightly")
url = uri("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies")
}
}
kotlin {
jvmToolchain(17)
}
publishing {
repositories {
maven {
@@ -38,6 +42,6 @@ publishing {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("com.jetbrains.intellij.platform:workspace-model-codegen:LATEST-TRUNK-SNAPSHOT")
implementation("com.jetbrains.intellij.platform:workspace-model-codegen:0.0.1")
implementation("com.jetbrains.intellij.platform:workspace-model-storage:223.8836.34")
}
platform/workspaceModel/codegen/build.gradle.kts
+4
View File
@@ -19,6 +19,10 @@ repositories {
}
}
kotlin {
jvmToolchain(17)
}
publishing {
repositories {
maven {
plugins/devkit/intellij.devkit.workspaceModel/src/CodegenJarLoader.kt
+13 -12
View File
@@ -21,14 +21,14 @@ import java.util.*
@Service(Service.Level.PROJECT)
class CodegenJarLoader(val project: Project) {
private val classLoaderToVersion = mutableMapOf<Int, ClassLoader>()
private val classLoaderToVersion = mutableMapOf<String, ClassLoader>()
suspend fun getClassLoader(): ClassLoader? {
val targetApiVersion = calculateTargetApiVersion() ?: return null
val result = classLoaderToVersion[targetApiVersion]
val artifactVersion = calculateArtifactVersion() ?: return null
val result = classLoaderToVersion[artifactVersion]
return if (result == null) {
val classLoader = loadJar() ?: return null
classLoaderToVersion[targetApiVersion] = classLoader
classLoaderToVersion[artifactVersion] = classLoader
classLoader
} else {
result
@@ -36,10 +36,9 @@ class CodegenJarLoader(val project: Project) {
}
private suspend fun loadJar(): ClassLoader? {
val calculateTargetApiVersion = calculateTargetApiVersion()
thisLogger().debug("Calculated target API version: $calculateTargetApiVersion")
val codegenLibraryDescription = JpsMavenRepositoryLibraryDescriptor(GROUP_ID, ARTIFACT_ID,
VERSION, false, emptyList())
val artifactVersion = calculateArtifactVersion() ?: return null
val codegenLibraryDescription = JpsMavenRepositoryLibraryDescriptor(GROUP_ID, ARTIFACT_ID, artifactVersion,
false, emptyList())
val promise = JarRepositoryManager.loadDependenciesAsync(project, codegenLibraryDescription, setOf(ArtifactKind.ARTIFACT),
listOf(INTELLIJ_DEPENDENCIES_DESCRIPTION), null)
@@ -51,12 +50,14 @@ class CodegenJarLoader(val project: Project) {
return URLClassLoader(arrayOf(pathToJar), this.javaClass.classLoader)
}
private fun calculateTargetApiVersion(): Int? {
private fun calculateArtifactVersion(): String? {
val allScope = GlobalSearchScope.allScope(project)
val generatorVersionsClass = JavaPsiFacade.getInstance(project).findClass(CodeGeneratorVersions::class.java.name, allScope) ?: return null
thisLogger().debug("Reading generator version from: ${generatorVersionsClass.containingFile.containingDirectory}")
val versionField = generatorVersionsClass.findFieldByName("API_VERSION_INTERNAL", false) ?: return null
return (versionField.initializer as? PsiLiteralExpression)?.value as? Int
val apiVersion = (versionField.initializer as? PsiLiteralExpression)?.value as? Int ?: return null
thisLogger().debug("Calculated target API version: $apiVersion")
return "$VERSION$apiVersion"
}
companion object {
@@ -64,11 +65,11 @@ class CodegenJarLoader(val project: Project) {
private const val GROUP_ID = "com.jetbrains.intellij.platform"
private const val ARTIFACT_ID = "workspace-model-codegen-impl"
private const val VERSION = "0.0.6"
private const val VERSION = "0.0."
private val INTELLIJ_DEPENDENCIES_DESCRIPTION = RemoteRepositoryDescription(
"intellij-dependencies",
"Intellij Dependencies",
"https://packages.jetbrains.team/maven/p/ide-accessibility-assistant/codegen-test",
"https://packages.jetbrains.team/maven/p/ij/intellij-dependencies",
)
}
}