Skip to content

Commit fb53ae7

Browse files
authored
build: Update for quilt (FabricMC#2)
1 parent eecbc95 commit fb53ae7

File tree

2 files changed

+23
-26
lines changed

2 files changed

+23
-26
lines changed

build.gradle

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
plugins {
2-
id 'java'
2+
id 'java-library'
33
id 'application'
44
id 'maven-publish'
5-
id 'com.github.johnrengelman.shadow' version '5.1.0'
65
id 'org.openjfx.javafxplugin' version '0.0.8'
76
id 'de.jjohannes.extra-java-module-info' version '0.5'
87
}
98

109
repositories {
11-
mavenCentral()
12-
maven {
13-
name "Fabric"
14-
url 'https://maven.fabricmc.net/'
15-
}
10+
mavenCentral()
11+
maven {
12+
name "Quilt"
13+
url 'https://maven.quiltmc.org/repository/release/'
14+
}
1615
}
1716

1817
archivesBaseName = 'matcher'
19-
group = 'net.fabricmc'
18+
group = 'org.quiltmc'
2019

2120
sourceSets {
22-
main {
23-
java.srcDirs = ['src']
21+
main {
22+
java.srcDirs = ['src']
2423
resources.srcDirs = ['res']
25-
}
24+
}
2625
}
2726

2827
javafx {
@@ -48,35 +47,33 @@ tasks.withType(JavaCompile).configureEach {
4847
}
4948

5049
dependencies {
51-
implementation "com.github.javaparser:javaparser-core:3.8.3"
52-
implementation "org.bitbucket.mstrobel:procyon-compilertools:0.5.33.6"
53-
implementation "org.ow2.asm:asm:9.0"
50+
implementation "com.github.javaparser:javaparser-core:3.8.3"
51+
implementation "org.quiltmc:procyon-quilt-compilertools:0.5.35.local"
52+
api "org.ow2.asm:asm:9.0"
5453
implementation "org.ow2.asm:asm-commons:9.0"
55-
implementation "org.ow2.asm:asm-tree:9.0"
54+
api "org.ow2.asm:asm-tree:9.0"
5655
implementation "org.ow2.asm:asm-util:9.0"
57-
implementation "org.benf:cfr:0.150"
58-
implementation "net.fabricmc:fabric-fernflower:1.3.0"
56+
implementation "org.quiltmc:cfr:0.0.2"
57+
implementation "org.quiltmc:quiltflower:1.3.0"
5958
}
6059

60+
// TODO: Add Automatic-Module-Name to all these in Quilt forks
6161
extraJavaModuleInfo {
62-
automaticModule("cfr-0.150.jar", "cfr")
63-
automaticModule("procyon-compilertools-0.5.33.6.jar", "procyon.compilertools")
64-
automaticModule("procyon-core-0.5.33.6.jar", "procyon.core")
65-
automaticModule("fabric-fernflower-1.3.0.jar", "intellij.fernflower")
62+
automaticModule("cfr-0.0.2.jar", "cfr")
63+
automaticModule("procyon-quilt-compilertools-0.5.35.local.jar", "procyon.compilertools")
64+
automaticModule("procyon-quilt-core-0.5.35.local.jar", "procyon.core")
65+
automaticModule("quiltflower-1.3.0.jar", "intellij.fernflower")
6666
}
6767

6868
application {
6969
mainModule = 'matcher'
70-
mainClassName = 'matcher.Main'
70+
mainClass = 'matcher.Main'
7171
}
7272

73-
build.dependsOn(shadowJar)
74-
7573
publishing {
7674
publications {
7775
mavenJava(MavenPublication) {
7876
from components.java
79-
artifact shadowJar
8077
}
8178
}
8279
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)