User: kyle wood Date: 29 Jan 23 07:15 Revision: f41c4504da3d48fbff53fdb585ee5ec8029a3f57 Summary: Merge branch '2022.1' into 2022.2 TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8273&personal=false Index: build.gradle.kts =================================================================== --- build.gradle.kts (revision 0ab5461d2eed7ad001f021d4d820ac9feb1e7e1e) +++ build.gradle.kts (revision f41c4504da3d48fbff53fdb585ee5ec8029a3f57) @@ -3,7 +3,7 @@ * * https://minecraftdev.org * - * Copyright (c) 2022 minecraft-dev + * Copyright (c) 2023 minecraft-dev * * MIT License */ @@ -17,12 +17,12 @@ import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask plugins { - kotlin("jvm") version "1.7.20" + kotlin("jvm") version "1.8.0" java mcdev groovy idea - id("org.jetbrains.intellij") version "1.9.0" + id("org.jetbrains.intellij") version "1.12.0" id("org.cadixdev.licenser") id("org.jlleitschuh.gradle.ktlint") version "10.3.0" } @@ -243,27 +243,7 @@ } } systemProperty("NO_FS_ROOTS_ACCESS_CHECK", "true") - - jvmArgs( - "-Dsun.io.useCanonCaches=false", - "-Dsun.io.useCanonPrefixCache=false", - "--add-opens", "java.base/java.io=ALL-UNNAMED", - "--add-opens", "java.base/java.lang.invoke=ALL-UNNAMED", - "--add-opens", "java.base/java.lang.ref=ALL-UNNAMED", - "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED", - "--add-opens", "java.base/java.lang=ALL-UNNAMED", - "--add-opens", "java.base/java.util.concurrent.atomic=ALL-UNNAMED", - "--add-opens", "java.base/java.util.concurrent.locks=ALL-UNNAMED", - "--add-opens", "java.base/java.util.concurrent=ALL-UNNAMED", - "--add-opens", "java.base/sun.nio.fs=ALL-UNNAMED", - "--add-opens", "java.desktop/java.awt.event=ALL-UNNAMED", - "--add-opens", "java.desktop/java.awt=ALL-UNNAMED", - "--add-opens", "java.desktop/javax.swing.plaf.basic=ALL-UNNAMED", - "--add-opens", "java.desktop/javax.swing=ALL-UNNAMED", - "--add-opens", "java.desktop/sun.awt=ALL-UNNAMED", - "--add-opens", "java.desktop/sun.font=ALL-UNNAMED", - "--add-opens", "java.desktop/sun.swing=ALL-UNNAMED", - ) + jvmArgs("--illegal-access=deny") } idea { @@ -366,7 +346,6 @@ tasks.runIde { maxHeapSize = "4G" - jvmArgs("--add-exports=java.base/jdk.internal.vm=ALL-UNNAMED") System.getProperty("debug")?.let { systemProperty("idea.ProcessCanceledException", "disabled") systemProperty("idea.debug.mode", "true") Index: gradle.properties =================================================================== --- gradle.properties (revision 0ab5461d2eed7ad001f021d4d820ac9feb1e7e1e) +++ gradle.properties (revision f41c4504da3d48fbff53fdb585ee5ec8029a3f57) @@ -3,7 +3,7 @@ # # https://minecraftdev.org # -# Copyright (c) 2022 minecraft-dev +# Copyright (c) 2023 minecraft-dev # # MIT License # @@ -14,7 +14,9 @@ ideaVersion = 2022.2 ideaVersionName = 2022.2 -coreVersion = 1.5.21 +coreVersion = 1.5.22 downloadIdeaSources = true pluginTomlVersion = 222.3345.108 + +kotlin.stdlib.default.dependency = false Index: src/main/kotlin/platform/MinecraftProjectViewNodeDecorator.kt =================================================================== --- src/main/kotlin/platform/MinecraftProjectViewNodeDecorator.kt (revision 0ab5461d2eed7ad001f021d4d820ac9feb1e7e1e) +++ src/main/kotlin/platform/MinecraftProjectViewNodeDecorator.kt (revision f41c4504da3d48fbff53fdb585ee5ec8029a3f57) @@ -3,7 +3,7 @@ * * https://minecraftdev.org * - * Copyright (c) 2022 minecraft-dev + * Copyright (c) 2023 minecraft-dev * * MIT License */ Index: src/main/kotlin/platform/mixin/action/FindMixinsAction.kt =================================================================== --- src/main/kotlin/platform/mixin/action/FindMixinsAction.kt (revision 0ab5461d2eed7ad001f021d4d820ac9feb1e7e1e) +++ src/main/kotlin/platform/mixin/action/FindMixinsAction.kt (revision f41c4504da3d48fbff53fdb585ee5ec8029a3f57) @@ -3,7 +3,7 @@ * * https://minecraftdev.org * - * Copyright (c) 2022 minecraft-dev + * Copyright (c) 2023 minecraft-dev * * MIT License */ Index: src/main/kotlin/util/actions.kt =================================================================== --- src/main/kotlin/util/actions.kt (revision 0ab5461d2eed7ad001f021d4d820ac9feb1e7e1e) +++ src/main/kotlin/util/actions.kt (revision f41c4504da3d48fbff53fdb585ee5ec8029a3f57) @@ -3,7 +3,7 @@ * * https://minecraftdev.org * - * Copyright (c) 2022 minecraft-dev + * Copyright (c) 2023 minecraft-dev * * MIT License */ Index: src/main/resources/META-INF/plugin.xml =================================================================== --- src/main/resources/META-INF/plugin.xml (revision 0ab5461d2eed7ad001f021d4d820ac9feb1e7e1e) +++ src/main/resources/META-INF/plugin.xml (revision f41c4504da3d48fbff53fdb585ee5ec8029a3f57) @@ -3,7 +3,7 @@ https://minecraftdev.org - Copyright (c) 2022 minecraft-dev + Copyright (c) 2023 minecraft-dev MIT License -->