User: rednesto Date: 14 Jun 24 09:50 Revision: 7f4f185c355ea2e5069f1b7c07391f0ae17c8f61 Summary: Fixes for latest EAP breaking changes TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9322&personal=false Index: build.gradle.kts =================================================================== --- build.gradle.kts (revision 8ecc137e99c206755addd279f0c83b299e0665db) +++ build.gradle.kts (revision 7f4f185c355ea2e5069f1b7c07391f0ae17c8f61) @@ -34,7 +34,7 @@ mcdev groovy idea - id("org.jetbrains.intellij.platform") version "2.0.0-beta5" + id("org.jetbrains.intellij.platform") version "2.0.0-beta6" id("org.cadixdev.licenser") id("org.jlleitschuh.gradle.ktlint") version "10.3.0" } Index: gradle.properties =================================================================== --- gradle.properties (revision 8ecc137e99c206755addd279f0c83b299e0665db) +++ gradle.properties (revision 7f4f185c355ea2e5069f1b7c07391f0ae17c8f61) @@ -21,7 +21,7 @@ # suppress inspection "UnusedProperty" for whole file kotlin.code.style=official -ideaVersion = 242.14146.16-EAP-SNAPSHOT +ideaVersion = 242.16677.21-EAP-SNAPSHOT ideaVersionName = 2024.2 coreVersion = 1.7.5 Index: gradle/libs.versions.toml =================================================================== --- gradle/libs.versions.toml (revision 8ecc137e99c206755addd279f0c83b299e0665db) +++ gradle/libs.versions.toml (revision 7f4f185c355ea2e5069f1b7c07391f0ae17c8f61) @@ -18,7 +18,7 @@ grammarKit = "org.jetbrains.idea:grammar-kit:1.5.1" # Gradle Tooling -gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:242.14146.16-EAP-SNAPSHOT" +gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:242.16677.21-EAP-SNAPSHOT" annotations = "org.jetbrains:annotations:24.0.0" groovy = "org.codehaus.groovy:groovy:3.0.19" Index: src/main/kotlin/creator/step/OptionalSteps.kt =================================================================== --- src/main/kotlin/creator/step/OptionalSteps.kt (revision 8ecc137e99c206755addd279f0c83b299e0665db) +++ src/main/kotlin/creator/step/OptionalSteps.kt (revision 7f4f185c355ea2e5069f1b7c07391f0ae17c8f61) @@ -22,7 +22,6 @@ import com.demonwav.mcdev.asset.MCDevBundle import com.demonwav.mcdev.creator.updateWhenChanged -import com.intellij.ide.users.LocalUserSettings import com.intellij.ide.wizard.AbstractNewProjectWizardStep import com.intellij.ide.wizard.NewProjectWizardBaseData.Companion.baseData import com.intellij.ide.wizard.NewProjectWizardStep @@ -33,6 +32,7 @@ import com.intellij.ui.dsl.builder.Panel import com.intellij.ui.dsl.builder.bindText import com.intellij.ui.dsl.builder.columns +import com.intellij.util.SystemProperties abstract class AbstractOptionalStringStep(parent: NewProjectWizardStep) : AbstractNewProjectWizardStep(parent) { protected abstract val label: String @@ -148,7 +148,7 @@ init { if (format.isEmpty()) { - format = "https://github.com/${LocalUserSettings.userName}/$PROJECT_NAME_PLACEHOLDER" + format = "https://github.com/${SystemProperties.getUserName()}/$PROJECT_NAME_PLACEHOLDER" } } @@ -167,7 +167,7 @@ init { if (format.isEmpty()) { - format = "https://github.com/${LocalUserSettings.userName}/$PROJECT_NAME_PLACEHOLDER/issues" + format = "https://github.com/${SystemProperties.getUserName()}/$PROJECT_NAME_PLACEHOLDER/issues" } } Index: src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt =================================================================== --- src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt (revision 8ecc137e99c206755addd279f0c83b299e0665db) +++ src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt (revision 7f4f185c355ea2e5069f1b7c07391f0ae17c8f61) @@ -43,7 +43,7 @@ import com.intellij.platform.backend.workspace.toVirtualFileUrl import com.intellij.platform.workspace.jps.entities.LibraryRoot import com.intellij.platform.workspace.jps.entities.LibraryRootTypeId -import com.intellij.platform.workspace.jps.entities.modifyEntity +import com.intellij.platform.workspace.jps.entities.modifyLibraryEntity import com.intellij.platform.workspace.storage.MutableEntityStorage import com.intellij.workspaceModel.ide.impl.legacyBridge.library.LibraryBridge import com.intellij.workspaceModel.ide.impl.legacyBridge.library.ProjectLibraryTableBridgeImpl.Companion.findLibraryEntity @@ -93,7 +93,7 @@ return true } - diff.modifyEntity(libraryEntity) { + diff.modifyLibraryEntity(libraryEntity) { roots += LibraryRoot(newUrl, annotationsRootType) } return true