Skip to content

Commit f4bc7e8

Browse files
Fix Gradle deprecation warnings
1 parent 20103c7 commit f4bc7e8

File tree

4 files changed

+18
-19
lines changed

4 files changed

+18
-19
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ def props = project.properties
2929
def sysProps = System.getProperties()
3030
def details = versionDetails()
3131

32-
group 'com.cleanroommc'
32+
group = 'com.cleanroommc'
3333

3434
if (project.hasProperty("release")) {
35-
version(details.lastTag)
35+
version = details.lastTag
3636
} else if (!project.hasProperty("run_number")) {
37-
version(details.lastTag + "+build." + details.commitDistance)
37+
version = details.lastTag + "+build." + details.commitDistance
3838
} else {
39-
version(details.lastTag + "+build." + details.commitDistance + ".run." + props.run_number)
39+
version = details.lastTag + "+build." + details.commitDistance + ".run." + props.run_number
4040
}
4141

4242
def version_txt = new File(project.projectDir, "version.txt")
@@ -57,7 +57,7 @@ tasks.withType(JavaCompile).configureEach {
5757
idea.project.settings.compiler.javac.javacAdditionalOptions = ProjectConstants.COMPILER_JVM_ARGUMENTS.join(' ')
5858

5959
tasks.register('setup') {
60-
group 'setup'
60+
group = 'setup'
6161
// These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
6262
dependsOn ':minecraft:extractMapped'
6363
dependsOn ':cleanroom:extractMapped'

projects/cleanroom/build.gradle

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ repositories {
7373
mavenLocal()
7474
mavenCentral()
7575
maven {
76-
name 'Cleanroom Maven'
77-
url 'https://maven.cleanroommc.com/'
76+
name = 'Cleanroom Maven'
77+
url = 'https://maven.cleanroommc.com/'
7878
}
7979
maven {
80-
url "https://repo.cleanroommc.com/snapshots"
80+
url = "https://repo.cleanroommc.com/snapshots"
8181
}
8282
maven {
83-
url "https://maven.outlands.top/releases/"
83+
url = "https://maven.outlands.top/releases/"
8484
}
8585
}
8686

@@ -430,7 +430,7 @@ afterEvaluate { p ->
430430
originalPrefix = genPatches.originalPrefix
431431
modifiedPrefix = genPatches.modifiedPrefix
432432
output = patches
433-
autoHeader true
433+
autoHeader = true
434434
lineEnding = '\n'
435435
}
436436
bakePatches {
@@ -887,6 +887,10 @@ if (project.hasProperty('UPDATE_MAPPINGS')) {
887887
sourceSets.test.java.srcDirs.each { extractMappedNew.addTarget it }
888888
}
889889

890+
tasks.named("assemble") {
891+
dependsOn(universalJar, installerJar)
892+
}
893+
890894

891895
publishing {
892896
repositories {
@@ -913,8 +917,3 @@ publishing {
913917
}
914918
}
915919
}
916-
917-
artifacts {
918-
archives universalJar
919-
archives installerJar
920-
}

projects/mcp/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ apply plugin: 'top.outlands.gradle.mcp'
55

66
repositories {
77
maven {
8-
name "outlandsReleases"
9-
url "https://maven.outlands.top/releases"
8+
name = "outlandsReleases"
9+
url = "https://maven.outlands.top/releases"
1010
}
1111
}
1212

projects/minecraft/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ apply plugin: 'top.outlands.gradle.patcher'
88
repositories {
99
mavenLocal()
1010
maven {
11-
name "outlandsReleases"
12-
url "https://maven.outlands.top/releases"
11+
name = "outlandsReleases"
12+
url = "https://maven.outlands.top/releases"
1313
}
1414
mavenCentral()
1515
}

0 commit comments

Comments
 (0)