Skip to content

Commit

Permalink
Small buildscript cleanup, update PMD
Browse files Browse the repository at this point in the history
  • Loading branch information
Hubry committed Feb 22, 2022
1 parent a9a9dbe commit 36e7e71
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 25 deletions.
24 changes: 5 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ buildscript {
repositories {
maven { url = 'https://maven.minecraftforge.net' }
maven { url = 'https://repo.spongepowered.org/maven' }
jcenter()
mavenCentral()
}
dependencies {
Expand All @@ -19,11 +18,8 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.spongepowered.mixin'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'

apply plugin: 'pmd'

apply from: 'https://raw.githubusercontent.com/SizableShrimp/Forge-Class-Remapper/main/classremapper.gradle'

ext.configFile = file('build.properties')
ext.config = parseConfig(configFile)

Expand All @@ -41,12 +37,6 @@ if (System.getenv('BUILD_NUMBER') != null) {
}

minecraft {
// The mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD Snapshot are built nightly.
// stable_# Stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not always work.
// Simply re-run your setup task after changing the mappings to update your workspace.

mappings channel: "${config.mapping_channel}", version: "${config.mapping_version}"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.

Expand All @@ -57,21 +47,17 @@ minecraft {
runs {
client {
workingDirectory project.file('run')
arg "-mixin.config=quark.mixins.json"

mods {
examplemod {
quark {
source sourceSets.main
}
}
}

server {
workingDirectory project.file('run')
arg "-mixin.config=quark.mixins.json"

mods {
examplemod {
quark {
source sourceSets.main
}
}
Expand All @@ -81,6 +67,7 @@ minecraft {

mixin {
add sourceSets.main, 'quark.mixins.refmap.json'
config 'quark.mixins.json'
}

repositories {
Expand Down Expand Up @@ -124,9 +111,8 @@ spotless {
}

pmd {
toolVersion '6.22.0'
// no way around this warning unless we upgrade Gradle, apparently
//incrementalAnalysis.set(true)
toolVersion '6.42.0'
incrementalAnalysis.set(true)
ruleSets.clear()
ruleSetFiles = files("spotless/pmd-ruleset.xml")
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 5 additions & 5 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -32,10 +32,10 @@
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
Expand Down

0 comments on commit 36e7e71

Please sign in to comment.