diff --git a/build.gradle b/build.gradle index 237b20bf..9df0279c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,9 @@ +import java.time.Duration + plugins { id 'java-library' - id 'io.codearte.nexus-staging' version '0.21.1' + id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' id "org.openjfx.javafxplugin" version "0.0.10" apply false - id 'de.marcphilipp.nexus-publish' version '0.4.0' apply false } if (System.getProperty('os.name').toLowerCase().contains("mac")) { @@ -35,12 +36,20 @@ subprojects { } } -nexusStaging { +nexusPublishing { packageGroup = 'com.gluonhq' - username = project.hasProperty('sonatypeUsername') ? project.property('sonatypeUsername') : '' - password = project.hasProperty('sonatypePassword') ? project.property('sonatypePassword') : '' - numberOfRetries = 30 - delayBetweenRetriesInMillis = 5000 + repositories { + sonatype { + username = project.hasProperty('sonatypeUsername') ? project.property('sonatypeUsername') : '' + password = project.hasProperty('sonatypePassword') ? project.property('sonatypePassword') : '' + } + } + clientTimeout = Duration.ofMinutes(5) + connectTimeout = Duration.ofMinutes(5) + transitionCheckOptions { + maxRetries.set(30) + delayBetween.set(Duration.ofMillis(5000)) + } } task copyModuleSources { diff --git a/gradle/mavenPublish.gradle b/gradle/mavenPublish.gradle index 6055d77b..7064472f 100644 --- a/gradle/mavenPublish.gradle +++ b/gradle/mavenPublish.gradle @@ -1,11 +1,8 @@ apply from: rootProject.file("gradle/native-build.gradle") -import java.time.Duration - apply plugin: 'java' apply plugin: 'maven-publish' apply plugin: 'signing' -apply plugin: 'de.marcphilipp.nexus-publish' jar { exclude "**/impl/Desktop**", "**/impl/IOS**", "**/impl/Android**", "META-INF/substrate" @@ -89,12 +86,3 @@ signing { sign publishing.publications.maven required = { gradle.taskGraph.hasTask(publish) && !version.endsWith("SNAPSHOT") } } - -nexusPublishing { - repositories { - sonatype() - } - // credentials are shared from staging plugin - clientTimeout = Duration.ofMinutes(5) - connectTimeout = Duration.ofMinutes(5) -}