diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 451ef62..817203b 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -126,4 +126,4 @@ jobs: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRIBUTION }} - name: Publish to Maven Central - run: ./gradlew publishAllPublicationsToCentralPortal \ No newline at end of file + run: ./gradlew publishAggregationToCentralPortal diff --git a/build.gradle.kts b/build.gradle.kts index 2ac2839..47000a6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,9 +3,9 @@ plugins { id("signing") id("maven-publish") id("project-report") - id("com.diffplug.spotless") version "6.25.0" - id("com.github.ben-manes.versions") version "0.51.0" - id("com.gradleup.nmcp") version "0.0.9" + id("com.diffplug.spotless") version "7.2.1" + id("com.github.ben-manes.versions") version "0.52.0" + id("com.gradleup.nmcp.aggregation").version("1.0.2") } group = "network.lightsail" @@ -107,14 +107,16 @@ signing { sign(publishing.publications["mavenJava"]) } -nmcp { - // https://github.com/GradleUp/nmcp - publishAllProjectsProbablyBreakingProjectIsolation { +nmcpAggregation { + centralPortal { username = System.getenv("SONATYPE_USERNAME") password = System.getenv("SONATYPE_PASSWORD") // publish manually from the portal - publicationType = "USER_MANAGED" + publishingType = "USER_MANAGED" // or if you want to publish automatically - // publicationType = "AUTOMATIC" + // publishingType = "AUTOMATIC" } + + // Publish all projects that apply the 'maven-publish' plugin + publishAllProjectsProbablyBreakingProjectIsolation() } diff --git a/src/main/java/org/stellar/sdkandroidspi/ApacheCodec.java b/src/main/java/org/stellar/sdkandroidspi/ApacheCodec.java index a26719a..a6a5285 100644 --- a/src/main/java/org/stellar/sdkandroidspi/ApacheCodec.java +++ b/src/main/java/org/stellar/sdkandroidspi/ApacheCodec.java @@ -621,7 +621,7 @@ void decode(final byte[] input, int inPos, final int inAvail, final Context cont // For backwards compatibility 3 & 6 chars are decoded anyway rather than discarded. // See the encode(byte[]) method EOF section. switch (context.modulus) { - // case 0 : // impossible, as excluded above + // case 0 : // impossible, as excluded above case 1: // 5 bits - either ignore entirely, or raise an exception validateTrailingCharacters(); case 2: // 10 bits, drop 2 and output one byte