ci: Cleanup and finish transition

This commit is contained in:
NotMyFault 2021-11-22 16:56:20 +01:00
parent 7d5659aeac
commit 52293f54e8
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
4 changed files with 14 additions and 25 deletions

View File

@ -2,6 +2,11 @@ import org.ajoberstar.grgit.Grgit
import java.time.format.DateTimeFormatter
import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
import java.net.URI
plugins {
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
}
logger.lifecycle("""
*******************************************
@ -66,3 +71,12 @@ allprojects {
}
applyCommonConfiguration()
nexusPublishing {
repositories {
sonatype {
nexusUrl.set(URI.create("https://s01.oss.sonatype.org/service/local/"))
snapshotRepositoryUrl.set(URI.create("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
}
}
}

View File

@ -29,5 +29,4 @@ dependencies {
implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0")
implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.2.0")
implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
}

View File

@ -1,5 +1,4 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import io.github.gradlenexus.publishplugin.NexusPublishExtension
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.artifacts.ExternalModuleDependency
@ -23,7 +22,6 @@ import org.gradle.kotlin.dsl.named
import org.gradle.kotlin.dsl.provideDelegate
import org.gradle.kotlin.dsl.register
import org.gradle.plugins.signing.SigningExtension
import java.net.URI
import javax.inject.Inject
fun Project.applyLibrariesConfiguration() {
@ -32,7 +30,6 @@ fun Project.applyLibrariesConfiguration() {
apply(plugin = "maven-publish")
apply(plugin = "com.github.johnrengelman.shadow")
apply(plugin = "signing")
apply(plugin = "io.github.gradle-nexus.publish-plugin")
configurations {
create("shade")
@ -229,15 +226,6 @@ fun Project.applyLibrariesConfiguration() {
}
}
configure<NexusPublishExtension> {
repositories {
sonatype {
nexusUrl.set(URI.create("https://s01.oss.sonatype.org/service/local/"))
snapshotRepositoryUrl.set(URI.create("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
}
}
}
}
// A horrible hack because `softwareComponentFactory` has to be gotten via plugin

View File

@ -13,8 +13,6 @@ import org.gradle.kotlin.dsl.provideDelegate
import org.gradle.kotlin.dsl.register
import org.gradle.kotlin.dsl.the
import org.gradle.plugins.signing.SigningExtension
import io.github.gradlenexus.publishplugin.NexusPublishExtension
import java.net.URI
fun Project.applyPlatformAndCoreConfiguration() {
applyCommonConfiguration()
@ -24,7 +22,6 @@ fun Project.applyPlatformAndCoreConfiguration() {
apply(plugin = "maven-publish")
apply(plugin = "com.github.johnrengelman.shadow")
apply(plugin = "signing")
apply(plugin = "io.github.gradle-nexus.publish-plugin")
applyCommonJavaConfiguration(
sourcesJar = name in setOf("worldedit-core", "worldedit-bukkit"),
@ -116,15 +113,6 @@ fun Project.applyPlatformAndCoreConfiguration() {
}
}
configure<NexusPublishExtension> {
repositories {
sonatype {
nexusUrl.set(URI.create("https://s01.oss.sonatype.org/service/local/"))
snapshotRepositoryUrl.set(URI.create("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
}
}
}
if (name != "worldedit-fabric") {
configurations["compileClasspath"].apply {
resolutionStrategy.componentSelection {