diff --git a/.releaserc b/.releaserc index f017199c..7431eed8 100644 --- a/.releaserc +++ b/.releaserc @@ -1,5 +1,5 @@ branches: - - main + - fix/maven plugins: - "@semantic-release/commit-analyzer" - "@semantic-release/release-notes-generator" @@ -8,7 +8,7 @@ plugins: - files: - "build.gradle.kts" from: "\\bversion = \".*\"" - to: "version = '${nextRelease.version}'" + to: "version = \"${nextRelease.version}\"" - files: - "README.md" from: ":([0-9]+).([0-9]+).([0-9]+)" @@ -18,7 +18,7 @@ plugins: publishCmd: "./gradlew publish --warn --stacktrace" - - "@semantic-release/git" - assets: - - "build.gradle" + - "build.gradle.kts" - "*.md" - "@semantic-release/github" options: diff --git a/README.md b/README.md index e4a0819c..15c6f134 100644 --- a/README.md +++ b/README.md @@ -22,14 +22,14 @@ You no longer need to specify the Maps SDK for Android or its Utility Library as ```groovy dependencies { - implementation 'com.google.maps.android:maps-compose:5.0.3' + implementation 'com.google.maps.android:maps-compose:5.0.4' // Optionally, you can include the Compose utils library for Clustering, // Street View metadata checks, etc. - implementation 'com.google.maps.android:maps-compose-utils:5.0.3' + implementation 'com.google.maps.android:maps-compose-utils:5.0.4' // Optionally, you can include the widgets library for ScaleBar, etc. - implementation 'com.google.maps.android:maps-compose-widgets:5.0.3' + implementation 'com.google.maps.android:maps-compose-widgets:5.0.4' } ``` diff --git a/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt b/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt index 2dcb9e37..642fc888 100644 --- a/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt @@ -91,9 +91,15 @@ class PublishingConventionPlugin : Plugin { val releasesRepoUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") val snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/") url = if (project.version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl + val sonatypeUsername = project.findProperty("sonatypeUsername") as String? + val sonatypePassword = project.findProperty("sonatypePassword") as String? + + println("Username size: ${sonatypeUsername?.length ?: "null"}") + println("Password size: ${sonatypePassword?.length ?: "null"}") + credentials { - username = project.findProperty("sonatypeUsername") as String? - password = project.findProperty("sonatypePassword") as String? + username = sonatypeUsername + password = sonatypePassword } } } diff --git a/build.gradle.kts b/build.gradle.kts index 7bd4b0e4..72065e39 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,7 +32,7 @@ val projectArtifactId by extra { project: Project -> allprojects { group = "com.google.maps.android" - version = "5.0.3" + version = "5.0.4" val projectArtifactId by extra { project.name } }