Skip to content

Commit 00b9a23

Browse files
committed
Merge branch '2024.1' into 2024.2
# Conflicts: # gradle/libs.versions.toml
2 parents 98b7912 + f8d87fb commit 00b9a23

File tree

38 files changed

+151
-75
lines changed

38 files changed

+151
-75
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ body:
3535
- Sponge
3636
- Architectury
3737
- Minecraft Forge
38+
- NeoForge
3839
- Fabric
3940
- Velocity
4041
- Mixins
@@ -46,4 +47,4 @@ body:
4647
id: description
4748
attributes:
4849
label: Description of the bug
49-
description: Always include a stack trace if there is one. Otherwise, the more information you can provide in terms of how to reproduce the problem, the more likely it'll be fixed. If there is something specific about your project, a link to the GitHub project can be very helpful.
50+
description: Always include a stack trace if there is one. Otherwise, the more information you can provide in terms of how to reproduce the problem, the more likely it'll be fixed. If there is something specific about your project, a link to the GitHub project can be very helpful.

.github/ISSUE_TEMPLATE/project_wizard_outdated.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ body:
3434
- Sponge
3535
- Architectury
3636
- Minecraft Forge
37+
- NeoForge
3738
- Fabric
3839
- Velocity
3940
- BungeeCord

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
echo "GRADLE_USER_HOME=$HOME/.gradle" >> "$GITHUB_ENV"
4040
echo "mcdev.deploy.token=${JETBRAINS_TOKEN}" > ~/.gradle/gradle.properties
4141
- name: Publish plugin
42-
run: ./gradlew clean publishPlugin --no-daemon --stacktrace
42+
run: ./gradlew clean :publishPlugin --no-daemon --stacktrace
4343
- name: Get tag name
4444
id: get_tag
4545
shell: bash

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ plugins {
3434
`mcdev-publishing`
3535
}
3636

37-
val ideaVersionName: String by project
3837
val coreVersion: String by project
3938

4039
val gradleToolingExtension: Configuration by configurations.creating
@@ -43,7 +42,6 @@ val testLibs: Configuration by configurations.creating {
4342
}
4443

4544
group = "com.demonwav.mcdev"
46-
version = "$ideaVersionName-$coreVersion"
4745

4846
val gradleToolingExtensionSourceSet: SourceSet = sourceSets.create("gradle-tooling-extension") {
4947
configurations.named(compileOnlyConfigurationName) {

buildSrc/src/main/kotlin/mcdev-core.gradle.kts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@ plugins {
3232
id("org.cadixdev.licenser")
3333
}
3434

35+
val ideaVersionName: String by project
36+
val coreVersion: String by project
37+
val buildNumber: String? by project
38+
39+
version = "$ideaVersionName-$coreVersion"
40+
41+
// Build numbers are used for nightlies
42+
if (buildNumber != null) {
43+
version = "$version-$buildNumber"
44+
}
45+
3546
java {
3647
toolchain {
3748
languageVersion.set(JavaLanguageVersion.of(21))
@@ -99,7 +110,7 @@ dependencies {
99110
}
100111

101112
testImplementation(libs.junit.api)
102-
testCompileOnly(libs.junit.vintage) // Hack to get tests to compile and run
113+
testImplementation(libs.junit.vintage) // Hack to get tests to compile and run
103114
testRuntimeOnly(libs.junit.engine)
104115
testRuntimeOnly(libs.junit.platform.launcher)
105116
}

buildSrc/src/main/kotlin/mcdev-publishing.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ plugins {
2323
}
2424

2525
tasks.publishPlugin {
26-
// Build numbers are used for nightlies
27-
properties["buildNumber"]?.let { buildNumber ->
28-
project.version = "${project.version}-$buildNumber"
29-
}
3026
properties["mcdev.deploy.token"]?.let { deployToken ->
3127
token.set(deployToken.toString())
3228
}

changelog.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@
55
### Added
66

77
- `plugin.yml`, `paper-plugin.yml` and `bungee.yml` main class reference and validity inspection
8+
- `mods.toml` and `neoforge.mods.toml` documentation for lookup elements
9+
- Support for split strings within inspections and method target references in Mixins ([#2358](https://github.com/minecraft-dev/MinecraftDev/pull/2358))
10+
- Mouse ungrab on breakpoint hit while running a Gradle task
11+
12+
### Changed
13+
14+
- More reliable ClassFqn creator property suggestions and validation
15+
- Lang spellchecking now works in dumb mode
16+
17+
### Fixed
18+
19+
- [#2362](https://github.com/minecraft-dev/MinecraftDev/issues/2362) CME in fabric.mod.json
20+
- Ignored annotations registrations
21+
- NeoGradle and NeoModDev Minecraft version import
22+
- [#2360](https://github.com/minecraft-dev/MinecraftDev/issues/2360) `Class initialization must not depend on services` error
823

924
## [1.8.1] - 2024-08-10
1025

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ asm = "9.6"
77
fuel = "2.3.1"
88
licenser = "0.6.1"
99
changelog = "2.2.0"
10-
intellij-plugin = "2.0.1"
10+
intellij-plugin = "2.1.0"
1111
intellij-ide = "2024.2"
1212
idea-ext = "1.1.8"
1313
psiPlugin = "242.4697"

obfuscation-explorer/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,11 @@ plugins {
2626
`mcdev-publishing`
2727
}
2828

29-
val ideaVersionName: String by project
30-
val coreVersion: String by project
31-
3229
val jflex by configurations
3330
val jflexSkeleton by configurations
3431
val grammarKit by configurations
3532

3633
group = "io.mcdev.obfex"
37-
version = "$ideaVersionName-$coreVersion"
3834

3935
intellijPlatform {
4036
projectName = "Obfuscation Explorer"

src/main/kotlin/creator/custom/CustomPlatformStep.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import com.demonwav.mcdev.creator.custom.providers.EmptyLoadedTemplate
2626
import com.demonwav.mcdev.creator.custom.providers.LoadedTemplate
2727
import com.demonwav.mcdev.creator.custom.providers.TemplateProvider
2828
import com.demonwav.mcdev.creator.modalityState
29+
import com.demonwav.mcdev.util.getOrLogException
2930
import com.intellij.ide.wizard.AbstractNewProjectWizardStep
3031
import com.intellij.ide.wizard.GitNewProjectWizardData
3132
import com.intellij.ide.wizard.NewProjectWizardBaseData
3233
import com.intellij.ide.wizard.NewProjectWizardStep
3334
import com.intellij.openapi.application.EDT
3435
import com.intellij.openapi.application.asContextElement
35-
import com.intellij.openapi.diagnostic.getOrLogException
3636
import com.intellij.openapi.diagnostic.logger
3737
import com.intellij.openapi.observable.properties.GraphProperty
3838
import com.intellij.openapi.observable.util.transform
@@ -50,8 +50,6 @@ import com.intellij.ui.dsl.builder.bindText
5050
import com.intellij.util.application
5151
import com.intellij.util.ui.AsyncProcessIcon
5252
import javax.swing.JLabel
53-
import kotlin.collections.component1
54-
import kotlin.collections.component2
5553
import kotlinx.coroutines.Dispatchers
5654
import kotlinx.coroutines.Job
5755
import kotlinx.coroutines.cancel

0 commit comments

Comments
 (0)