diff --git a/build.gradle b/build.gradle index 7810e2b..383a047 100644 --- a/build.gradle +++ b/build.gradle @@ -108,41 +108,13 @@ subprojects { p -> jar { manifest { attributes([ - 'Implementation-Commit-Time': managedVersioning.timestamp.get(), - 'Implementation-Commit': managedVersioning.hash.get() + 'Implementation-Commit-Time': managedVersioning.timestamp.get(), + 'Implementation-Commit': managedVersioning.hash.get() ]) } } - publishing { - repositories { - if (System.getenv('PR_NUMBER')) { - maven { - name = 'LocalMaven' - url = rootProject.layout.buildDirectory.dir('repo') - } - } else if (System.getenv('MAVEN_PASSWORD')) { - maven { - name = 'PersonalMaven' - url = uri(System.getenv('SNAPSHOT_MAVEN_URL') ?: System.getenv('MAVEN_URL')) - credentials { - username = System.getenv('MAVEN_USER') - password = System.getenv('MAVEN_PASSWORD') - } - } - } - } - } -} - -javadoc { - source subprojects.collect { it.sourceSets.main.allJava } - classpath = files(subprojects.collect { it.sourceSets.main.compileClasspath }) - include "**/api/**" -} - -tasks.register('prepareJavadoc', Copy) { - dependsOn tasks.javadoc - from tasks.javadoc.outputs - into layout.buildDirectory.dir("prepareJavadoc/${project.group.replace('.','/')}/${project.version.split('\\.')[0]}") + managedVersioning.publishing.mavenPullRequest(publishing) + managedVersioning.publishing.mavenSnapshot(publishing) + managedVersioning.publishing.mavenRelease(publishing) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9034eca..2f32666 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,8 +17,8 @@ autoservice = "1.1.1" architectury_loom = "1.4.373" quilt_licenser = "2.0.1" -dynassetgen = "5.1.1" -defaultresources = "3.2.0" +dynassetgen = "5.1.2" +defaultresources = "3.2.1" mixinextras = "0.3.2" @@ -27,7 +27,7 @@ jspecify = "0.3.0" minotaur = "2.8.3" -managedversioning = "1.2.3" +managedversioning = "1.2.4" [libraries] minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }