Skip to content

Commit

Permalink
Fully fix modularity
Browse files Browse the repository at this point in the history
  • Loading branch information
Matyrobbrt committed Mar 1, 2024
1 parent 54b73ea commit 1144f0f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ sourceSets {
ext.languageVersion = 16
ext.modularityExcluded = true // don't add ourselves
}
modularityDummy {}
}

// Because Mixin aims to support a variety of environments, we have to be able to run with older versions of GSON and Guava that lack official module
Expand Down Expand Up @@ -364,7 +365,7 @@ if (JavaVersion.current().isJava8Compatible()) {
}

task stagingJar(type: ShadowJar) {
sourceSets.findAll { !(it.name =~ /example|test/) }.each {
sourceSets.findAll { !(it.name =~ /example|test|modularityDummy/) }.each {
from it.output
}
configurations = [project.configurations.stagingJar]
Expand Down
2 changes: 2 additions & 0 deletions src/modularity/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,6 @@
provides org.spongepowered.tools.obfuscation.service.IObfuscationService
with org.spongepowered.tools.obfuscation.mcp.ObfuscationServiceMCP,
org.spongepowered.tools.obfuscation.fg3.ObfuscationServiceFG3;

uses org.spongepowered.include.com.google.common.base.PatternCompiler;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.spongepowered.include.com.google.common.base;

// Dummy public class so that the module can declare a uses directive for it
public interface PatternCompiler {
}

0 comments on commit 1144f0f

Please sign in to comment.