diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml index 57a516bb..5b008e98 100644 --- a/.github/workflows/release-snapshot.yml +++ b/.github/workflows/release-snapshot.yml @@ -23,8 +23,7 @@ jobs: - name: Build and upload archives to the Maven Central Repository run: ./gradlew afterpay:publishAllPublicationsToMavenCentralRepository --no-daemon --no-parallel env: - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME_FOR_TOKEN }} - ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_TOKEN }} - ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.PGP_SIGNING_KEY_ID }} - ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SIGNING_KEY }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_SIGNING_PASSWORD }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SECRET_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SECRET_PASSPHRASE }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ddbe02dd..271cb70e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,17 +23,10 @@ jobs: - name: Clean repository before building SDK run: ./gradlew clean - - name: Build and upload archives to the Maven Central Repository - run: ./gradlew afterpay:publishAllPublicationsToMavenCentralRepository --no-daemon --no-parallel + - name: Build and publish release to Maven Central + run: ./gradlew afterpay:publishAndReleaseToMavenCentral --no-configuration-cache --no-daemon --no-parallel env: - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME_FOR_TOKEN }} - ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_TOKEN }} - ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.PGP_SIGNING_KEY_ID }} - ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SIGNING_KEY }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_SIGNING_PASSWORD }} - - - name: Publish release to the Maven Central Repository - run: ./gradlew closeAndReleaseRepository - env: - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME_FOR_TOKEN }} - ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_TOKEN }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SECRET_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SECRET_PASSPHRASE }} diff --git a/afterpay/build.gradle.kts b/afterpay/build.gradle.kts index 67180521..91724b2f 100644 --- a/afterpay/build.gradle.kts +++ b/afterpay/build.gradle.kts @@ -13,6 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import org.gradle.plugins.signing.Sign + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -78,15 +80,12 @@ dependencies { testImplementation(libs.mockK) } +mavenPublishing { + publishToMavenCentral() + signAllPublications() +} + tasks.withType { val version = project.version.toString() onlyIf { !version.endsWith("SNAPSHOT") } } - -signing { - useInMemoryPgpKeys( - findProperty("signingKeyId").toString(), - findProperty("signingKey").toString(), - findProperty("signingPassword").toString(), - ) -} diff --git a/docs/installation.md b/docs/installation.md index 9f4879ae..f379d4ed 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -38,7 +38,7 @@ Follow the steps below to add the latest snapshot build to your project. repositories { ... maven { - url = 'https://oss.sonatype.org/content/repositories/snapshots/' + url = 'https://central.sonatype.com/repository/maven-snapshots/' } ... } @@ -48,7 +48,7 @@ repositories { ``` gradle dependencies { - implementation 'com.afterpay:afterpay-android:4.8.3-SNAPSHOT' # or specific "vX.X.X-SNAPSHOT" version of this library. + implementation 'com.afterpay:afterpay-android:4.9.0-SNAPSHOT' # or specific "vX.X.X-SNAPSHOT" version of this library. } ``` diff --git a/gradle.properties b/gradle.properties index dda17fb6..78033f0d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.afterpay -VERSION_NAME=4.8.3-SNAPSHOT +VERSION_NAME=4.9.0-SNAPSHOT POM_URL=https://github.com/afterpay/sdk-android/ POM_SCM_URL=https://github.com/afterpay/sdk-android/ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 89f4e4fe..d3ca569b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ minSdk = "24" java = "17" # remember to update java version in .github/workflows as well androidGradlePlugin = "8.2.2" -kotlin = "1.7.20" +kotlin = "1.9.20" kotlinx_coroutines = "1.7.1" kotlinx_serialization = "1.5.1" @@ -15,10 +15,10 @@ core_ktx = "1.10.1" junit = "4.13.2" ktlint = "0.48.2" material = "1.12.0" -maven_publish_plugin = "0.17.0" +maven_publish_plugin = "0.35.0" mockk = "1.13.5" -moshi = "1.14.0" # latest version that is compatible with kotlin 1.7.x -retrofit = "2.9.0" # latest version that is compatible with kotlin 1.7.x +moshi = "1.14.0" +retrofit = "2.9.0" secretsGradlePlugin = "2.0.1" tools_desugar_sdk = "2.1.2" @@ -54,4 +54,3 @@ spotless = "com.diffplug.spotless:7.0.0.BETA1" kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven_publish_plugin" } secrets-gradle-plugin = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secretsGradlePlugin" } - diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6b219fa0..37f853b1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Wed Dec 02 12:29:11 AEDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip