Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to the Neoforge GDI artifact #47

Merged
merged 2 commits into from
Nov 12, 2023
Merged

Switch to the Neoforge GDI artifact #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f039b0f
Switch to the Neoforge GDI artifact
shartte Nov 11, 2023
be6fe71
Remove method that is now auto-generated by GDI.
shartte Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ subprojects.forEach { subProject ->
//Basic dependencies: Jetbrains Annotations, JUnit and Mockito for now.
subProject.dependencies.api subProject.dependencies.gradleApi()
subProject.dependencies.api "org.jetbrains:annotations:${project.jetbrains_annotations_version}"
subProject.dependencies.api "net.minecraftforge:groovydslimprover:${project.groovy_dsl_improver_version}"
subProject.dependencies.api "net.minecraftforge:groovydslimprover:${project.groovy_dsl_improver_version}:base"
subProject.dependencies.api "net.minecraftforge:groovydslimprover:${project.groovy_dsl_improver_version}:runtime"
subProject.dependencies.api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}"
subProject.dependencies.api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}:base"
subProject.dependencies.api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}:runtime"

subProject.dependencies.testImplementation subProject.dependencies.gradleTestKit()
subProject.dependencies.testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit_version}"
Expand Down
2 changes: 1 addition & 1 deletion dsl/common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ dependencies {
api "org.apache.maven:maven-artifact:${project.maven_artifact_version}"
api "com.google.guava:guava:${project.guava_version}"
api "com.google.code.gson:gson:${project.gson_version}"
api "net.minecraftforge:groovydslimprover:${project.groovy_dsl_improver_version}"
api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}"
}
2 changes: 1 addition & 1 deletion dsl/mixin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ plugins {
dependencies {
api "org.codehaus.groovy:groovy-all:${project.groovy_version}"
api "com.google.code.gson:gson:${project.gson_version}"
api "net.minecraftforge:groovydslimprover:${project.groovy_dsl_improver_version}"
api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}"
}
2 changes: 1 addition & 1 deletion dsl/neoform/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ dependencies {

api "org.codehaus.groovy:groovy-all:${project.groovy_version}"
api "com.google.code.gson:gson:${project.gson_version}"
api "net.minecraftforge:groovydslimprover:${project.groovy_dsl_improver_version}"
api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}"
}
2 changes: 1 addition & 1 deletion dsl/platform/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
dependencies {
api "org.codehaus.groovy:groovy-all:${project.groovy_version}"
api "com.google.code.gson:gson:${project.gson_version}"
api "net.minecraftforge:groovydslimprover:${project.groovy_dsl_improver_version}"
api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}"

api project(':dsl-common')
api project(':utils')
Expand Down
4 changes: 0 additions & 4 deletions dsl/platform/src/main/groovy/net/neoforged/gradle/dsl/platform/model/InstallerProfile.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@ abstract class InstallerProfile implements ConfigurableDSLElement<InstallerProfi
@Optional
abstract ListProperty<String> getArguments();

void arguments(String... args) {
getArguments().addAll(args)
}

@Input
@DSLProperty
@Optional
Expand Down
2 changes: 1 addition & 1 deletion dsl/userdev/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
dependencies {
api "org.codehaus.groovy:groovy-all:${project.groovy_version}"
api "com.google.code.gson:gson:${project.gson_version}"
api "net.minecraftforge:groovydslimprover:${project.groovy_dsl_improver_version}"
api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}"

compileOnly project(':dsl-common')
compileOnly project(':dsl-neoform')
Expand Down
2 changes: 1 addition & 1 deletion dsl/vanilla/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
dependencies {
api "org.codehaus.groovy:groovy-all:${project.groovy_version}"
api "com.google.code.gson:gson:${project.gson_version}"
api "net.minecraftforge:groovydslimprover:${project.groovy_dsl_improver_version}"
api "net.neoforged:groovydslimprover:${project.groovy_dsl_improver_version}"

compileOnly project(':dsl-common')
}
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ diffpatch_version=1.5.0.29
jarjar_version=0.3.19
jetbrains_annotations_version=23.0.0
gradle_idea_extension_version=1.1.6
groovy_dsl_improver_version=1.0.4
groovy_dsl_improver_version=1.0.9
eclipse_launch_configs_version=0.1.3

#Test dependencies
Expand Down
Loading