diff --git a/.github/workflows/ossrh-publish.yml b/.github/workflows/ossrh-publish.yml index c52603de..92e22094 100644 --- a/.github/workflows/ossrh-publish.yml +++ b/.github/workflows/ossrh-publish.yml @@ -33,9 +33,7 @@ jobs: run: | echo "${{secrets.SIGNING_SECRET_KEY_RING_FILE}}" > ~/.gradle/secring.gpg.b64 base64 -d ~/.gradle/secring.gpg.b64 > ~/.gradle/secring.gpg - - name: Publish, close and release Nexus Repository - run: ./gradlew publishToSonatype closeAndReleaseStagingRepositories -Psigning.keyId=${{secrets.SIGNING_KEY_ID}} -Psigning.password=${{secrets.SIGNING_PASSWORD}} -Psigning.secretKeyRingFile=$(echo ~/.gradle/secring.gpg) + - name: Publish to Maven Central + run: ./gradlew publish --info -Psigning.keyId=${{secrets.SIGNING_KEY_ID}} -Psigning.password=${{secrets.SIGNING_PASSWORD}} -Psigning.secretKeyRingFile=$(echo ~/.gradle/secring.gpg) env: - OSSRH_USERNAME: ${{secrets.OSSRH_USERNAME}} - OSSRH_PASSWORD: ${{secrets.OSSRH_PASSWORD}} - SONATYPE_STAGING_PROFILE_ID: ${{secrets.SONATYPE_STAGING_PROFILE_ID}} + MAVEN_BEARER: ${{secrets.MAVEN_BEARER}} diff --git a/build.gradle b/build.gradle index e6a15a25..579f4a8f 100644 --- a/build.gradle +++ b/build.gradle @@ -9,20 +9,25 @@ plugins { // Apply the java-library plugin to add support for Java Library id 'java-library' - id 'maven-publish' - id 'signing' + id 'jacoco' - id 'io.github.gradle-nexus.publish-plugin' version "2.0.0" id "com.diffplug.spotless" version "6.13.0" + + id 'maven-publish' + id 'signing' + // Sonatype Nexus Publish Plugin + id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' } group = 'com.meilisearch.sdk' -archivesBaseName = 'meilisearch-java' version = '0.14.5' java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 + + withJavadocJar() + withSourcesJar() } jacoco { @@ -44,10 +49,6 @@ repositories { mavenCentral() } -configurations { - testCompile.extendsFrom compileOnly -} - dependencies { // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation 'com.google.code.gson:gson:2.12.1' @@ -78,19 +79,6 @@ dependencies { implementation 'com.auth0:java-jwt:4.5.0' } -task buildJar(type: Jar) { - archiveBaseName = 'meilisearch-java' - from { - configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } - } - { - exclude 'META-INF/*.SF' - exclude 'META-INF/*.DSA' - exclude 'META-INF/*.RSA' - } - with jar -} - test { finalizedBy jacocoTestReport useJUnitPlatform { @@ -122,11 +110,6 @@ task integrationTest(type: Test) { } } -java { - withJavadocJar() - withSourcesJar() -} - publishing { publications { mavenJava(MavenPublication) { @@ -159,29 +142,6 @@ publishing { } } } - repositories { - maven { - url "https://oss.sonatype.org/service/local/staging/deploy/maven2" - credentials { - username System.getenv('OSSRH_USERNAME') - password System.getenv('OSSRH_PASSWORD') - } - } - } -} - -nexusPublishing { - packageGroup = "com.meilisearch" - - repositories { - sonatype { - nexusUrl.set(uri("https://oss.sonatype.org/service/local/")) - - username = System.getenv('OSSRH_USERNAME') - password = System.getenv('OSSRH_PASSWORD') - stagingProfileId = System.getenv('SONATYPE_STAGING_PROFILE_ID') - } - } } signing { @@ -203,3 +163,19 @@ spotless { googleJavaFormat('1.7').aosp() } } + + +// Nexus Publish Plugin configuration +nexusPublishing { + packageGroup.set("com.meilisearch") + + repositories { + sonatype { + nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) + + username.set(System.getenv('MAVEN_CENTRAL_USERNAME')) + password.set(System.getenv('MAVEN_CENTRAL_PASSWORD')) + } + } +} diff --git a/docker-compose.yml b/docker-compose.yml index 9a93a135..bec719f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.8" - services: package: image: azul/zulu-openjdk:8-latest diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index e69de29b..00000000