Skip to content

Commit 62d07e6

Browse files
EnnuiLEnnuiL
committed
Clean up the buildscript, fix publishing everywhere
1 parent e9dd13d commit 62d07e6

File tree

8 files changed

+122
-159
lines changed

8 files changed

+122
-159
lines changed

‎api_fabric/build.gradle.kts‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
plugins {
2-
`java-library`
3-
`maven-publish`
4-
}
5-
6-
group = "page.langeweile.wrench_wrapper"
7-
version = rootProject.version
8-
9-
repositories {
10-
mavenCentral()
11-
maven("https://maven.fabricmc.net")
12-
maven("https://maven.quiltmc.org/repository/release/")
2+
id("common-conventions")
133
}
144

155
dependencies {
@@ -20,22 +10,3 @@ dependencies {
2010
compileOnly(libs.quilt.loader)
2111
compileOnly(libs.jspecify)
2212
}
23-
24-
tasks.processResources {
25-
filteringCharset = "UTF-8"
26-
27-
val version = project.version
28-
inputs.property("version", version)
29-
30-
filesMatching("fabric.mod.json") {
31-
expand("version" to version)
32-
}
33-
}
34-
35-
publishing {
36-
publications {
37-
create<MavenPublication>("maven") {
38-
from(components["java"])
39-
}
40-
}
41-
}

‎api_forge/build.gradle.kts‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,14 @@
11
plugins {
2-
`java-library`
3-
`maven-publish`
4-
}
5-
6-
group = "page.langeweile.wrench_wrapper"
7-
version = rootProject.version
8-
9-
repositories {
10-
mavenCentral()
11-
maven("https://maven.neoforged.net/releases")
12-
maven("https://maven.quiltmc.org/repository/release/")
2+
id("common-conventions")
133
}
144

155
dependencies {
166
api(libs.quilt.config)
177
implementation(libs.bundles.quilt.config)
188

199
compileOnly(libs.forge.mod.loader) {
20-
setTransitive(false)
10+
isTransitive = false
2111
}
2212
compileOnly(libs.jspecify)
2313
}
2414

25-
tasks.processResources {
26-
filteringCharset = "UTF-8"
27-
28-
val version = project.version
29-
inputs.property("version", version)
30-
31-
filesMatching("META-INF/mods.toml") {
32-
expand("version" to version)
33-
}
34-
}
35-
36-
publishing {
37-
publications {
38-
create<MavenPublication>("maven") {
39-
from(components["java"])
40-
}
41-
}
42-
}

‎api_neoforge/build.gradle.kts‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,13 @@
11
plugins {
2-
`java-library`
3-
`maven-publish`
4-
}
5-
6-
group = "page.langeweile.wrench_wrapper"
7-
version = rootProject.version
8-
9-
repositories {
10-
mavenCentral()
11-
maven("https://maven.neoforged.net/releases")
12-
maven("https://maven.quiltmc.org/repository/release/")
2+
id("common-conventions")
133
}
144

155
dependencies {
166
api(libs.quilt.config)
177
implementation(libs.bundles.quilt.config)
188

199
compileOnly(libs.fancy.mod.loader) {
20-
setTransitive(false)
10+
isTransitive = false
2111
}
2212
compileOnly(libs.jspecify)
2313
}
24-
25-
tasks.processResources {
26-
filteringCharset = "UTF-8"
27-
28-
val version = project.version
29-
inputs.property("version", version)
30-
31-
filesMatching("META-INF/neoforge.mods.toml") {
32-
expand("version" to version)
33-
}
34-
}
35-
36-
publishing {
37-
publications {
38-
create<MavenPublication>("maven") {
39-
from(components["java"])
40-
}
41-
}
42-
}

‎build-logic/build.gradle.kts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
plugins {
2+
`kotlin-dsl`
3+
}
4+
5+
repositories {
6+
gradlePluginPortal()
7+
}

‎build-logic/src/main/kotlin/common-conventions.gradle.kts‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
plugins {
2+
`java-library`
3+
`maven-publish`
4+
}
5+
6+
group = "page.langeweile.wrench_wrapper"
7+
version = "0.7.1"
8+
9+
// We want Java 17 because we don't aim to support Java 8 for now
10+
java {
11+
toolchain {
12+
languageVersion = JavaLanguageVersion.of(17)
13+
}
14+
}
15+
16+
tasks.withType<JavaCompile>().configureEach {
17+
options.release = 17
18+
}
19+
20+
tasks.withType<Jar>().configureEach {
21+
from(rootProject.file("LICENSE_wrench-wrapper.md")) {
22+
include("LICENSE_wrench-wrapper.md")
23+
}
24+
}
25+
26+
// TODO - Clear this mess!!!!!!
27+
tasks.processResources {
28+
filteringCharset = "UTF-8"
29+
30+
val version = project.version
31+
inputs.property("version", version)
32+
33+
filesMatching(listOf("fabric.mod.json", "quilt.mod.json", "META-INF/mods.toml", "META-INF/neoforge.mods.toml")) {
34+
expand("version" to version)
35+
}
36+
}
37+
38+
publishing {
39+
publications {
40+
create<MavenPublication>("maven") {
41+
from(components["java"])
42+
}
43+
}
44+
45+
repositories {
46+
val env = System.getenv()
47+
if (env.contains("MAVEN_UPLOAD_URL")) {
48+
maven(uri(env["MAVEN_UPLOAD_URL"]!!)) {
49+
credentials {
50+
username = env["MAVEN_UPLOAD_USERNAME"]
51+
password = env["MAVEN_UPLOAD_PASSWORD"]
52+
}
53+
}
54+
}
55+
}
56+
}

‎build.gradle.kts‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎impl/build.gradle.kts‎

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
plugins {
2-
`java`
3-
`maven-publish`
2+
id("common-conventions")
43
alias(libs.plugins.gr8)
54
}
65

7-
group = "page.langeweile.wrench_wrapper"
8-
version = rootProject.version
9-
10-
repositories {
11-
mavenCentral()
12-
maven("https://storage.googleapis.com/r8-releases/raw")
13-
maven("https://maven.quiltmc.org/repository/release/")
14-
}
15-
166
val shade = configurations.create("shade")
177

188
dependencies {
@@ -21,17 +11,6 @@ dependencies {
2111
shade(libs.bundles.quilt.config)
2212
}
2313

24-
tasks.processResources {
25-
filteringCharset = "UTF-8"
26-
27-
val version = project.version
28-
inputs.property("version", version)
29-
30-
filesMatching(listOf("fabric.mod.json", "quilt.mod.json", "META-INF/mods.toml", "META-INF/neoforge.mods.toml")) {
31-
expand("version" to version)
32-
}
33-
}
34-
3514
gr8 {
3615
val optimizedJar = create("shrink") {
3716
addProgramJarsFrom(shade)
@@ -41,23 +20,3 @@ gr8 {
4120
}
4221
replaceOutgoingJar(optimizedJar)
4322
}
44-
45-
publishing {
46-
publications {
47-
create<MavenPublication>("maven") {
48-
from(components["java"])
49-
}
50-
}
51-
52-
repositories {
53-
val env = System.getenv()
54-
if (env.contains("MAVEN_UPLOAD_URL")) {
55-
maven(uri(env["MAVEN_UPLOAD_URL"]!!)) {
56-
credentials {
57-
username = env["MAVEN_UPLOAD_USERNAME"]
58-
password = env["MAVEN_UPLOAD_PASSWORD"]
59-
}
60-
}
61-
}
62-
}
63-
}

‎settings.gradle.kts‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,59 @@
11
rootProject.name = "wrench-wrapper"
22

3+
pluginManagement {
4+
repositories {
5+
mavenCentral()
6+
gradlePluginPortal()
7+
}
8+
}
9+
10+
dependencyResolutionManagement {
11+
repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
12+
repositories {
13+
exclusiveContent {
14+
forRepository {
15+
maven("https://maven.quiltmc.org/repository/release/")
16+
}
17+
filter {
18+
includeGroup("org.quiltmc")
19+
includeGroup("org.quiltmc.parsers")
20+
includeGroup("org.quiltmc.quilt-config.serializers")
21+
}
22+
}
23+
exclusiveContent {
24+
forRepository {
25+
maven("https://maven.fabricmc.net")
26+
}
27+
filter {
28+
includeGroup("net.fabricmc")
29+
}
30+
}
31+
exclusiveContent {
32+
forRepository {
33+
maven("https://maven.neoforged.net/releases")
34+
}
35+
filter {
36+
includeGroup("net.neoforged.fancymodloader")
37+
}
38+
}
39+
exclusiveContent {
40+
forRepository {
41+
google()
42+
}
43+
filter {
44+
includeGroup("com.android.tools")
45+
}
46+
}
47+
mavenCentral()
48+
}
49+
}
50+
351
plugins {
452
id("org.gradle.toolchains.foojay-resolver-convention").version("1.0.0")
553
}
654

7-
include("api_fabric", "api_forge", "api_neoforge", "impl")
55+
includeBuild("build-logic")
56+
include("api_fabric")
57+
include("api_forge")
58+
include("api_neoforge")
59+
include("impl")

0 commit comments

Comments
 (0)