From f4f660dce55f153d41fc0435e72dcdc0cffb8549 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 4 May 2021 19:40:51 +0100 Subject: [PATCH 1/3] Fix typo --- .github/workflows/test-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-push.yml b/.github/workflows/test-push.yml index 1f659a40..a5135b91 100644 --- a/.github/workflows/test-push.yml +++ b/.github/workflows/test-push.yml @@ -47,7 +47,7 @@ jobs: test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }} exclude: - java: jdk16 - test: net.fabricmc.loom.test.intergration.KotlinTest + test: net.fabricmc.loom.test.integration.KotlinTest runs-on: ubuntu-20.04 container: From 927180e36b8ec957c0271fc122da9c92ebc04304 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 4 May 2021 20:06:24 +0100 Subject: [PATCH 2/3] Make all loom added configurations lazy --- .../configuration/CompileConfiguration.java | 42 ++++++++----------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 9199bab4..ce6dea44 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -25,7 +25,7 @@ package net.fabricmc.loom.configuration; import org.gradle.api.Project; -import org.gradle.api.artifacts.Configuration; +import org.gradle.api.artifacts.ConfigurationContainer; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPluginConvention; import org.gradle.api.tasks.SourceSet; @@ -47,32 +47,24 @@ public final class CompileConfiguration { } public static void setupConfigurations(Project project) { - Configuration modCompileClasspathConfig = project.getConfigurations().maybeCreate(Constants.Configurations.MOD_COMPILE_CLASSPATH); - modCompileClasspathConfig.setTransitive(true); - Configuration modCompileClasspathMappedConfig = project.getConfigurations().maybeCreate(Constants.Configurations.MOD_COMPILE_CLASSPATH_MAPPED); - modCompileClasspathMappedConfig.setTransitive(false); + final ConfigurationContainer configurations = project.getConfigurations(); + LoomProjectData data = project.getExtensions().getByType(LoomGradleExtension.class).getProjectData(); - Configuration minecraftNamedConfig = project.getConfigurations().maybeCreate(Constants.Configurations.MINECRAFT_NAMED); - minecraftNamedConfig.setTransitive(false); // The launchers do not recurse dependencies - Configuration minecraftDependenciesConfig = project.getConfigurations().maybeCreate(Constants.Configurations.MINECRAFT_DEPENDENCIES); - minecraftDependenciesConfig.setTransitive(false); - Configuration loaderDependenciesConfig = project.getConfigurations().maybeCreate(Constants.Configurations.LOADER_DEPENDENCIES); - loaderDependenciesConfig.setTransitive(false); - Configuration minecraftConfig = project.getConfigurations().maybeCreate(Constants.Configurations.MINECRAFT); - minecraftConfig.setTransitive(false); + data.createLazyConfiguration(Constants.Configurations.MOD_COMPILE_CLASSPATH).configure(configuration -> configuration.setTransitive(true)); + data.createLazyConfiguration(Constants.Configurations.MOD_COMPILE_CLASSPATH_MAPPED).configure(configuration -> configuration.setTransitive(false)); + data.createLazyConfiguration(Constants.Configurations.MINECRAFT_NAMED).configure(configuration -> configuration.setTransitive(false)); // The launchers do not recurse dependencies + data.createLazyConfiguration(Constants.Configurations.MINECRAFT_DEPENDENCIES).configure(configuration -> configuration.setTransitive(false)); + data.createLazyConfiguration(Constants.Configurations.LOADER_DEPENDENCIES).configure(configuration -> configuration.setTransitive(false)); + data.createLazyConfiguration(Constants.Configurations.MINECRAFT).configure(configuration -> configuration.setTransitive(false)); + data.createLazyConfiguration(Constants.Configurations.INCLUDE).configure(configuration -> configuration.setTransitive(false)); // Dont get transitive deps + data.createLazyConfiguration(Constants.Configurations.MAPPING_CONSTANTS); - Configuration includeConfig = project.getConfigurations().maybeCreate(Constants.Configurations.INCLUDE); - includeConfig.setTransitive(false); // Dont get transitive deps - - project.getConfigurations().maybeCreate(Constants.Configurations.MAPPING_CONSTANTS); extendsFrom(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, Constants.Configurations.MAPPING_CONSTANTS, project); - project.getConfigurations().maybeCreate(Constants.Configurations.MAPPINGS); - project.getConfigurations().maybeCreate(Constants.Configurations.MAPPINGS_FINAL); - project.getConfigurations().maybeCreate(Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES); - project.getConfigurations().maybeCreate(Constants.Configurations.UNPICK_CLASSPATH); - - LoomProjectData data = project.getExtensions().getByType(LoomGradleExtension.class).getProjectData(); + data.createLazyConfiguration(Constants.Configurations.MAPPINGS); + data.createLazyConfiguration(Constants.Configurations.MAPPINGS_FINAL); + data.createLazyConfiguration(Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES); + data.createLazyConfiguration(Constants.Configurations.UNPICK_CLASSPATH); for (RemappedConfigurationEntry entry : Constants.MOD_COMPILE_ENTRIES) { data.createLazyConfiguration(entry.getSourceConfiguration()) @@ -82,7 +74,7 @@ public final class CompileConfiguration { data.createLazyConfiguration(entry.getRemappedConfiguration()) .configure(configuration -> configuration.setTransitive(false)); - extendsFrom(entry.getTargetConfiguration(project.getConfigurations()), entry.getRemappedConfiguration(), project); + extendsFrom(entry.getTargetConfiguration(configurations), entry.getRemappedConfiguration(), project); if (entry.isOnModCompileClasspath()) { extendsFrom(Constants.Configurations.MOD_COMPILE_CLASSPATH, entry.getSourceConfiguration(), project); @@ -166,6 +158,6 @@ public final class CompileConfiguration { } private static void extendsFrom(String a, String b, Project project) { - project.getConfigurations().getByName(a).extendsFrom(project.getConfigurations().getByName(b)); + project.getConfigurations().getByName(a, configuration -> configuration.extendsFrom(project.getConfigurations().getByName(b))); } } From fc3a5ef052544da5c46ad12e166009fbdbe93c4b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 12 May 2021 14:03:45 +0100 Subject: [PATCH 3/3] Java 16 --- .github/workflows/test-push.yml | 10 +++++----- build.gradle | 9 +++------ gradle/wrapper/gradle-wrapper.properties | 2 +- .../fabricmc/loom/test/util/ProjectTestTrait.groovy | 4 ++-- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-push.yml b/.github/workflows/test-push.yml index a5135b91..960e82d5 100644 --- a/.github/workflows/test-push.yml +++ b/.github/workflows/test-push.yml @@ -5,8 +5,8 @@ jobs: strategy: fail-fast: false matrix: - gradle: [7.0.0] - java: [jdk8, jdk11, jdk16] + gradle: [7.0.1] + java: [jdk16] jvm: [hotspot] runs-on: ubuntu-20.04 container: @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: gradle:7.0.0-jdk16 + image: gradle:7.0.1-jdk16 options: --user root steps: @@ -43,7 +43,7 @@ jobs: strategy: fail-fast: false matrix: - java: [jdk8, jdk11, jdk16] + java: [jdk16] test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }} exclude: - java: jdk16 @@ -73,7 +73,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 1.8, 11, 16 ] + java: [ 16 ] os: [ windows-2019, ubuntu-20.04, macos-10.15 ] runs-on: ${{ matrix.os }} diff --git a/build.gradle b/build.gradle index f90a35ef..1a0b21a7 100644 --- a/build.gradle +++ b/build.gradle @@ -11,15 +11,12 @@ plugins { id "org.cadixdev.licenser" version "0.5.0" } -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 16 +targetCompatibility = 16 tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" - - if (JavaVersion.current().isJava9Compatible()) { - it.options.release = 8 - } + it.options.release = 16 } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643e..e5338d37 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy index 4e60f381..56ed8c9c 100644 --- a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy @@ -28,8 +28,8 @@ import org.gradle.testkit.runner.BuildResult import org.gradle.testkit.runner.GradleRunner trait ProjectTestTrait { - final static String DEFAULT_GRADLE = "7.0" - final static String PRE_RELEASE_GRADLE = "7.1-20210504162620+0000" + final static String DEFAULT_GRADLE = "7.0.1" + final static String PRE_RELEASE_GRADLE = "7.1-20210511220046+0000" static File gradleHome = File.createTempDir() File testProjectDir = File.createTempDir()