User: rednesto Date: 12 Sep 24 21:44 Revision: b7837c88e3346f2fc380e41dfffe9894abc6f25d Summary: Merge branch '2023.2' into 2023.3 # Conflicts: # build.gradle.kts # gradle.properties # gradle/libs.versions.toml # src/main/kotlin/platform/AbstractModuleType.kt TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9664&personal=false Index: gradle.properties =================================================================== --- gradle.properties (revision 255120dc1aaef3ee3c349b2c0f2df4c0187067ca) +++ gradle.properties (revision b7837c88e3346f2fc380e41dfffe9894abc6f25d) @@ -19,15 +19,12 @@ # # suppress inspection "UnusedProperty" for whole file -kotlin.code.style=official - -ideaVersion = 2023.3 ideaVersionName = 2023.3 coreVersion = 1.8.1 -downloadIdeaSources = true -pluginTomlVersion = 233.11799.172 - # Silences a build-time warning because we are bundling our own kotlin library kotlin.stdlib.default.dependency = false + +org.gradle.parallel=true +org.gradle.caching=true Index: gradle/libs.versions.toml =================================================================== --- gradle/libs.versions.toml (revision 255120dc1aaef3ee3c349b2c0f2df4c0187067ca) +++ gradle/libs.versions.toml (revision b7837c88e3346f2fc380e41dfffe9894abc6f25d) @@ -1,13 +1,33 @@ [versions] -coroutines = "1.7.3" -junit = "5.10.0" -junit-platform = "1.10.0" -asm = "9.5" +kotlin = "2.0.20" +coroutines = "1.9.0-RC.2" +junit = "5.10.2" +junit-platform = "1.10.2" +asm = "9.6" fuel = "2.3.1" +licenser = "0.6.1" +changelog = "2.2.0" +intellij-plugin = "2.0.1" +intellij-ide = "2023.3" +idea-ext = "1.1.8" +psiPlugin = "233.2" +[plugins] +kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +intellij-platform = { id = "org.jetbrains.intellij.platform", version.ref = "intellij-plugin" } +idea-ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "idea-ext" } +licenser = { id = "org.cadixdev.licenser", version.ref = "licenser" } +changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } + [libraries] -coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } -coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutines" } +kotlin-plugin = { module = "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin", version.ref = "kotlin" } +kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } +kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } + +intellij-plugin = { module = "org.jetbrains.intellij.platform:org.jetbrains.intellij.platform.gradle.plugin", version.ref = "intellij-plugin" } +licenser-plugin = { module = "org.cadixdev.licenser:org.cadixdev.licenser.gradle.plugin", version.ref = "licenser" } +changelog-plugin = { module = "org.jetbrains.changelog:org.jetbrains.changelog.gradle.plugin", version.ref = "changelog" } + coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" } mappingIo = "net.fabricmc:mapping-io:0.2.1" @@ -28,18 +48,23 @@ asm-analysis = { module = "org.ow2.asm:asm-analysis", version.ref = "asm" } asm-util = { module = "org.ow2.asm:asm-util", version.ref = "asm" } +gson = "com.google.code.gson:gson:2.10.1" + fuel = { module = "com.github.kittinunf.fuel:fuel", version.ref = "fuel" } fuel-coroutines = { module = "com.github.kittinunf.fuel:fuel-coroutines", version.ref = "fuel" } # Testing test-mockJdk = "org.jetbrains.idea:mock-jdk:1.7-4d76c50" test-mixin = "org.spongepowered:mixin:0.8.5" +test-spigotapi = "org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT" +test-bungeecord = "net.md-5:bungeecord-api:1.21-R0.1-SNAPSHOT" test-spongeapi = "org.spongepowered:spongeapi:7.4.0" test-fabricloader = "net.fabricmc:fabric-loader:0.15.11" test-nbt = "com.demonwav.mcdev:all-types-nbt:1.0" junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } -junit-entine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } +junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } +junit-vintage = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit" } junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" } mixinExtras-common = "io.github.llamalad7:mixinextras-common:0.5.0-beta.1" Index: src/main/kotlin/facet/MinecraftFacet.kt =================================================================== --- src/main/kotlin/facet/MinecraftFacet.kt (revision 255120dc1aaef3ee3c349b2c0f2df4c0187067ca) +++ src/main/kotlin/facet/MinecraftFacet.kt (revision b7837c88e3346f2fc380e41dfffe9894abc6f25d) @@ -28,6 +28,7 @@ import com.demonwav.mcdev.util.SourceType import com.demonwav.mcdev.util.filterNotNull import com.demonwav.mcdev.util.mapFirstNotNull +import com.demonwav.mcdev.util.runWriteActionAndWait import com.google.common.collect.HashMultimap import com.intellij.facet.Facet import com.intellij.facet.FacetManager @@ -36,7 +37,6 @@ import com.intellij.ide.projectView.ProjectView import com.intellij.openapi.application.runReadAction import com.intellij.openapi.application.runWriteAction -import com.intellij.openapi.application.runWriteActionAndWait import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleGrouper import com.intellij.openapi.module.ModuleManager @@ -146,7 +146,6 @@ } private fun register(type: AbstractModuleType<*>): AbstractModule { - type.performCreationSettingSetup(module.project) val module = type.generateModule(this) moduleMap[type] = module return module @@ -255,7 +254,7 @@ val ID = FacetTypeId(TYPE_ID) val facetType: MinecraftFacetType - get() = FacetTypeRegistry.getInstance().findFacetType(ID) as MinecraftFacetType + get() = facetTypeOrNull as MinecraftFacetType val facetTypeOrNull: MinecraftFacetType? get() = FacetTypeRegistry.getInstance().findFacetType(TYPE_ID) as? MinecraftFacetType Index: src/main/kotlin/platform/AbstractModuleType.kt =================================================================== --- src/main/kotlin/platform/AbstractModuleType.kt (revision 255120dc1aaef3ee3c349b2c0f2df4c0187067ca) +++ src/main/kotlin/platform/AbstractModuleType.kt (revision b7837c88e3346f2fc380e41dfffe9894abc6f25d) @@ -23,11 +23,8 @@ import com.demonwav.mcdev.facet.MinecraftFacet import com.demonwav.mcdev.insight.generation.ui.EventGenerationPanel import com.demonwav.mcdev.util.findContainingClass -import com.intellij.codeInspection.ex.EntryPointsManager -import com.intellij.codeInspection.ex.EntryPointsManagerBase import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleUtilCore -import com.intellij.openapi.project.Project import com.intellij.psi.PsiClass import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile @@ -56,17 +53,6 @@ abstract fun generateModule(facet: MinecraftFacet): T - fun performCreationSettingSetup(project: Project) { - if (project.isDisposed) { - return - } - val manager = EntryPointsManager.getInstance(project) - val annotations = (manager as? EntryPointsManagerBase)?.customAdditionalAnnotations?.toMutableList() ?: return - ignoredAnnotations.asSequence() - .filter { annotation -> !annotations.contains(annotation) } - .forEach { annotations.add(it) } - } - open fun getEventGenerationPanel(chosenClass: PsiClass): EventGenerationPanel { return EventGenerationPanel(chosenClass) }