diff --git a/.github/workflows/test-push.yml b/.github/workflows/test-push.yml index 5a199a7..36749b6 100644 --- a/.github/workflows/test-push.yml +++ b/.github/workflows/test-push.yml @@ -4,7 +4,7 @@ jobs: gradle: strategy: matrix: - gradle: [4.9, 4.10.2, 6.8.0] + gradle: [4.9, 4.10.2, 6.8.2] java: [jdk8, jdk11, jdk15] exclude: # Dont run older gradle versions on newer java - java: jdk15 @@ -23,3 +23,15 @@ jobs: - uses: actions/checkout@v1 - uses: gradle/wrapper-validation-action@v1 - run: gradle build check test --stacktrace + + gradle_pre_release: + runs-on: ubuntu-20.04 + container: + image: openjdk:8-jdk + options: --user root + steps: + - uses: actions/checkout@v1 + - run: ./gradlew wrapper --gradle-version=7.0-milestone-1 + - run: ./gradlew build check test --stacktrace --warning-mode fail + env: + TEST_WARNING_MODE: fail \ No newline at end of file diff --git a/build.gradle b/build.gradle index beb597d..e5e456c 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ plugins { id 'eclipse' id 'groovy' id 'checkstyle' + id "org.cadixdev.licenser" version "0.5.0" } sourceCompatibility = 1.8 @@ -84,7 +85,7 @@ dependencies { jar { manifest { - attributes 'Implementation-Version': version + ' Build(' + build + ')' + attributes 'Implementation-Version': project.version + ' Build(' + build + ')' } } @@ -98,9 +99,9 @@ task javadocJar(type: Jar, dependsOn: javadoc) { from javadoc.destinationDir } -apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/license.gradle' - license { + header rootProject.file("HEADER") + include "**/*.java" exclude '**/loom/util/DownloadUtil.java' } @@ -109,10 +110,6 @@ checkstyle { toolVersion = '8.39' } -checkstyleMain { - logging.setLevel(LogLevel.LIFECYCLE) -} - gradlePlugin { plugins { fabricLoom { diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 972144c..e24a64f 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -81,6 +81,7 @@ public final class CompileConfiguration { project.getConfigurations().maybeCreate(Constants.Configurations.MAPPINGS); project.getConfigurations().maybeCreate(Constants.Configurations.MAPPINGS_FINAL); + project.getConfigurations().maybeCreate(Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES); for (RemappedConfigurationEntry entry : Constants.MOD_COMPILE_ENTRIES) { Configuration compileModsConfig = project.getConfigurations().maybeCreate(entry.getSourceConfiguration()); @@ -105,6 +106,8 @@ public final class CompileConfiguration { extendsFrom(Constants.Configurations.MINECRAFT_NAMED, Constants.Configurations.LOADER_DEPENDENCIES, project); extendsFrom(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, Constants.Configurations.MAPPINGS_FINAL, project); + + extendsFrom(JavaPlugin.RUNTIME_ONLY_CONFIGURATION_NAME, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, project); } /** diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java index 7c3a894..c093621 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java @@ -79,9 +79,9 @@ public class LaunchProvider extends DependencyProvider { writeLog4jConfig(); FileUtils.writeStringToFile(getExtension().getDevLauncherConfig(), launchConfig.asString(), StandardCharsets.UTF_8); - addDependency(Constants.Dependencies.DEV_LAUNCH_INJECTOR + Constants.Dependencies.Versions.DEV_LAUNCH_INJECTOR, JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME); - addDependency(Constants.Dependencies.TERMINAL_CONSOLE_APPENDER + Constants.Dependencies.Versions.TERMINAL_CONSOLE_APPENDER, JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME); - annotationDependency = addDependency(Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS, "compileOnly"); + addDependency(Constants.Dependencies.DEV_LAUNCH_INJECTOR + Constants.Dependencies.Versions.DEV_LAUNCH_INJECTOR, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES); + addDependency(Constants.Dependencies.TERMINAL_CONSOLE_APPENDER + Constants.Dependencies.Versions.TERMINAL_CONSOLE_APPENDER, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES); + annotationDependency = addDependency(Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS, JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME); postPopulationScheduler.accept(this::writeRemapClassPath); } diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index f5afeb8..fb4ac48 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -76,6 +76,7 @@ public class Constants { public static final String MAPPINGS = "mappings"; public static final String MAPPINGS_FINAL = "mappingsFinal"; public static final String LOADER_DEPENDENCIES = "loaderLibraries"; + public static final String LOOM_DEVELOPMENT_DEPENDENCIES = "loomDevelopmentDependencies"; @Deprecated // Not to be used in gradle 7+ public static final String COMPILE = "compile"; diff --git a/src/test/groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy b/src/test/groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy index 6980d78..996ab65 100644 --- a/src/test/groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/EmptyBuildFunctionalTest.groovy @@ -35,7 +35,7 @@ class EmptyBuildFunctionalTest extends Specification { when: def result = GradleRunner.create() .withProjectDir(testProjectDir.root) - .withArguments('build',"--stacktrace") + .withArguments('build',"--stacktrace", "--warning-mode", System.getenv().TEST_WARNING_MODE ?: 'all') .withPluginClasspath() .forwardOutput() .build() diff --git a/src/test/groovy/net/fabricmc/loom/EmptyBuildMojangFunctionalTest.groovy b/src/test/groovy/net/fabricmc/loom/EmptyBuildMojangFunctionalTest.groovy index a49c388..d360ba6 100644 --- a/src/test/groovy/net/fabricmc/loom/EmptyBuildMojangFunctionalTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/EmptyBuildMojangFunctionalTest.groovy @@ -35,7 +35,7 @@ class EmptyBuildMojangFunctionalTest extends Specification { when: def result = GradleRunner.create() .withProjectDir(testProjectDir.root) - .withArguments('build',"--stacktrace") + .withArguments('build',"--stacktrace", "--warning-mode", System.getenv().TEST_WARNING_MODE ?: 'all') .withPluginClasspath() .forwardOutput() .build() diff --git a/src/test/groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy b/src/test/groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy index 6b0ae6d..b40a2ba 100644 --- a/src/test/groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/MixinBuildFunctionalTest.groovy @@ -54,7 +54,7 @@ class MixinBuildFunctionalTest extends Specification { when: def result = GradleRunner.create() .withProjectDir(testProjectDir.root) - .withArguments('build','--stacktrace') + .withArguments('build','--stacktrace', "--warning-mode", System.getenv().TEST_WARNING_MODE ?: 'all') .withPluginClasspath() .forwardOutput() .build() diff --git a/src/test/groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy b/src/test/groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy index b1182d9..756a3fa 100644 --- a/src/test/groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/SimpleBuildFunctionalTest.groovy @@ -45,7 +45,7 @@ class SimpleBuildFunctionalTest extends Specification { when: def result = GradleRunner.create() .withProjectDir(testProjectDir.root) - .withArguments('build',"--stacktrace") + .withArguments('build',"--stacktrace", "--warning-mode", System.getenv().TEST_WARNING_MODE ?: 'all') .withPluginClasspath() .forwardOutput() .withDebug(true)