Skip to content

Commit

Permalink
Fix generated poms missing dependencies since 9.0.0-alpha.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
gniftygnome committed Nov 11, 2023
1 parent 9445aba commit 8801c4a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 30 deletions.
35 changes: 7 additions & 28 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
dependencies {
afterEvaluate {
subprojects.each {
implementation project(path: "${it.name}", configuration: "dev")
implementation project(path: "${it.name}", configuration: "namedElements")
include project("${it.name}:")
}
}
Expand Down Expand Up @@ -62,19 +62,18 @@ allprojects {
compileOnly "com.google.code.findbugs:jsr305:3.0.2"
}

configurations {
dev
}

repositories {
maven {
name = 'TerraformersMC'
url = 'https://maven.terraformersmc.com/'
}
}

jar {
archiveClassifier.set("dev")
java {
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

tasks.withType(ProcessResources).configureEach {
Expand All @@ -85,11 +84,6 @@ allprojects {
}
}

task sourcesJar(type: Jar, dependsOn: classes) {
archiveClassifier.set("sources")
from sourceSets.main.allSource
}

tasks.withType(JavaCompile) {
it.options.encoding = "UTF-8"
it.options.release = 17
Expand All @@ -99,14 +93,6 @@ allprojects {
subprojects {
version = rootProject.version

task remapMavenJar(type: Copy, dependsOn: remapJar) {
afterEvaluate {
from("${project.buildDir}/libs/$archivesBaseName-${version}.jar")
into("${project.buildDir}/libs/")
rename { String fn -> "$archivesBaseName-${version}-maven.jar" }
}
}

publish {
onlyIf {
checkVersion(archivesBaseName, version)
Expand All @@ -116,14 +102,7 @@ subprojects {
publishing {
publications {
mavenJava(MavenPublication) {
afterEvaluate {
artifact(file("${project.buildDir}/libs/$archivesBaseName-${version}-maven.jar")) {
builtBy remapMavenJar
}
artifact(sourcesJar) {
builtBy remapSourcesJar
}
}
from components.java
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ org.gradle.jvmargs=-Xmx2G
fabric.loom.multiProjectOptimisation=true

maven_group=com.terraformersmc.terraform-api
version=9.0.0-alpha.2
version=9.0.0-alpha.3

minecraft_version=23w45a
yarn_mappings=23w45a+build.3
yarn_mappings=23w45a+build.4
loader_version=0.14.24
fabric_version=0.90.8+1.20.3

Expand Down

0 comments on commit 8801c4a

Please sign in to comment.