diff --git a/README.md b/README.md index 76f9fbc..1e50f9e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ class and in the Android manifest file. ## Installation -**NOTE**: Starting from v1.1.0, the maven coordinate of the plugin changed group ID to "com.google.android.libraries.mapsplatform.secrets-gradle-plugin" and artifact ID to "secrets-gradle-plugin" and is now being distributed via Google Maven (gMaven). You can still download previous versions of the plugin from Gradle's plugin portal, but new versions will now only be distributed through gMaven. +**NOTE**: Starting from v1.1.0, the plugin ID was changed to "com.google.android.libraries.mapsplatform.secrets-gradle-plugin" and the plugin is now being distributed via Google Maven (gMaven). You can still download previous versions of the plugin from Gradle's plugin portal, but new versions will now only be distributed through gMaven. 1. In your project's root `build.gradle` file: @@ -24,7 +24,7 @@ Groovy: ```groovy buildscript { dependencies { - classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.1.0" + classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.2.0" } } ``` @@ -33,12 +33,11 @@ Kotlin: ```kotlin buildscript { dependencies { - classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.1.0") + classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.2.0") } } ``` - 2. In your app-level `build.gradle` file: Groovy: diff --git a/build.gradle b/build.gradle index 339c170..31d6f79 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:4.1.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.1.0" + classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:1.2.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -24,4 +24,4 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} diff --git a/sample-app/build.gradle.kts b/sample-app/build.gradle.kts index 7ae9751..102f73b 100644 --- a/sample-app/build.gradle.kts +++ b/sample-app/build.gradle.kts @@ -17,7 +17,7 @@ plugins { id("kotlin-android") // 1. Include the plugin - id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin.secrets-gradle-plugin") + id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin") } android { diff --git a/secrets-gradle-plugin/build.gradle.kts b/secrets-gradle-plugin/build.gradle.kts index 81f4ed6..668f50b 100644 --- a/secrets-gradle-plugin/build.gradle.kts +++ b/secrets-gradle-plugin/build.gradle.kts @@ -35,8 +35,10 @@ dependencies { gradlePlugin { plugins { create(PluginInfo.name) { - id = "${PluginInfo.group}.${PluginInfo.artifactId}" + id = PluginInfo.group implementationClass = PluginInfo.implementationClass + displayName = PluginInfo.displayName + description = PluginInfo.description } } } @@ -49,7 +51,7 @@ pluginBundle { (plugins) { PluginInfo.name { - displayName = "Secrets Gradle Plugin for Android" + displayName = PluginInfo.displayName tags = listOf("kotlin", "android") } } @@ -97,15 +99,17 @@ publishing { } repositories { maven(url = "build/repository") + mavenLocal() } } object PluginInfo { - const val artifactId = "secrets-gradle-plugin" + const val artifactId = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin.gradle.plugin" const val description = "A Gradle plugin for providing secrets securely to an Android project." + const val displayName = "Secrets Gradle Plugin for Android" const val group = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin" const val implementationClass = "com.google.android.libraries.mapsplatform.secrets_gradle_plugin.SecretsPlugin" const val name = "secretsGradlePlugin" const val url = "https://github.com/google/secrets-gradle-plugin" - const val version = "1.1.0" + const val version = "1.2.0" } diff --git a/secrets-gradle-plugin/src/test/kotlin/com/google/android/libraries/mapsplatform/secrets_gradle_plugin/SecretsPluginTest.kt b/secrets-gradle-plugin/src/test/kotlin/com/google/android/libraries/mapsplatform/secrets_gradle_plugin/SecretsPluginTest.kt index c0572ac..05401db 100644 --- a/secrets-gradle-plugin/src/test/kotlin/com/google/android/libraries/mapsplatform/secrets_gradle_plugin/SecretsPluginTest.kt +++ b/secrets-gradle-plugin/src/test/kotlin/com/google/android/libraries/mapsplatform/secrets_gradle_plugin/SecretsPluginTest.kt @@ -57,7 +57,7 @@ class SecretsPluginTest { variant = mock() { on { mergedFlavor } doReturn flavor } - project.pluginManager.apply("com.google.android.libraries.mapsplatform.secrets-gradle-plugin.secrets-gradle-plugin") + project.pluginManager.apply("com.google.android.libraries.mapsplatform.secrets-gradle-plugin") } @Test(expected = ProjectConfigurationException::class) diff --git a/settings.gradle.kts b/settings.gradle.kts index 5afca0c..99451da 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,6 +16,7 @@ include(":secrets-gradle-plugin", ":sample-app") pluginManagement { repositories { + mavenLocal() maven(url = "./plugin/build/repository") gradlePluginPortal() }