From ec0f0a528369a7fcf4b48f59ef947671549e21a3 Mon Sep 17 00:00:00 2001 From: Vladimir Petko Date: Fri, 11 Oct 2024 08:27:19 +1300 Subject: [PATCH] chore: rename plugin (gradle plugin portal reject) --- .github/workflows/release.yml | 4 ++-- README.md | 12 ++++++------ build.gradle.kts | 4 ++-- rockcraft-gradle/build.gradle.kts | 2 +- .../com/canonical/rockcraft/gradle/alloptions.in | 2 +- .../com/canonical/rockcraft/gradle/architecture.in | 2 +- .../rockcraft/gradle/beryx-project-build.in | 2 +- .../rockcraft/gradle/beryx-runtime-project-build.in | 2 +- .../canonical/rockcraft/gradle/build-rock-java-11.in | 2 +- .../com/canonical/rockcraft/gradle/default-build.in | 2 +- .../rockcraft/gradle/rockcraft-plugin-options.in | 2 +- .../com/canonical/rockcraft/gradle/single-rock1.in | 2 +- .../com/canonical/rockcraft/gradle/single-rock2.in | 2 +- .../rockcraft/gradle/spring-boot-project.in | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 513336a..602343d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,8 +36,8 @@ jobs: ./gradlew publishPlugins -Pgradle.publish.key=$PUBLISH_KEY -Pgradle.publish.secret=$PUBLISH_SECRET shell: bash env: - PUBLISH_KEY: ${{ secrets.PUBLISH_KEY }} - PUBLISH_SECRET: ${{ secrets.PUBLISH_SECRET }} + PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }} + PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }} - name: Create GitHub release uses: softprops/action-gh-release@v2 diff --git a/README.md b/README.md index 0d58f03..4f6736e 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,13 @@ To use the plugin, apply the following two steps: **Groovy** plugins { - id 'io.rockcrafters.rockcraft' version '0.1.1' + id 'io.github.rockcrafters.rockcraft' version '0.2.1' } **Kotlin** plugins { - id("io.rockcrafters.rockcraft") version "0.1.1" + id("io.github.rockcrafters.rockcraft") version "0.2.1" } ##### Alternatively, you can use the `buildscript` DSL: @@ -39,10 +39,10 @@ To use the plugin, apply the following two steps: } } dependencies { - classpath 'io.rockcrafters.rockcraft:0.1.1' + classpath 'io.github.rockcrafters.rockcraft:0.2.1' } } - apply plugin: 'io.rockcrafters.rockcraft-plugin' + apply plugin: 'io.github.rockcrafters.rockcraft-plugin' **Kotlin** @@ -53,10 +53,10 @@ To use the plugin, apply the following two steps: } } dependencies { - classpath("io.rockcrafters.rockcraft:0.1.1") + classpath("io.github.rockcrafters.rockcraft:0.2.1") } } - apply(plugin = "io.rockcrafters.rockcraft") + apply(plugin = "io.github.rockcrafters.rockcraft") ### 2. Configure ROCK container diff --git a/build.gradle.kts b/build.gradle.kts index d7c6d72..0191165 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,4 @@ allprojects { - version = "0.1.1" - group = "io.rockcrafters" + version = "0.2.1" + group = "io.github.rockcrafters" } diff --git a/rockcraft-gradle/build.gradle.kts b/rockcraft-gradle/build.gradle.kts index 2578f75..e015cee 100644 --- a/rockcraft-gradle/build.gradle.kts +++ b/rockcraft-gradle/build.gradle.kts @@ -26,7 +26,7 @@ gradlePlugin { plugins { create("rockcraftPlugin") { - id = "io.rockcrafters.rockcraft" + id = "io.github.rockcrafters.rockcraft" displayName = "Rockcraft plugin" description = "Plugin for rock image generation" implementationClass = "com.canonical.rockcraft.gradle.RockcraftPlugin" diff --git a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/alloptions.in b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/alloptions.in index d10c023..486e09a 100644 --- a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/alloptions.in +++ b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/alloptions.in @@ -1,6 +1,6 @@ plugins { id('java') - id('io.rockcrafters.rockcraft') + id('io.github.rockcrafters.rockcraft') } version = 0.01 diff --git a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/architecture.in b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/architecture.in index 17f7b35..e5c3612 100644 --- a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/architecture.in +++ b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/architecture.in @@ -1,6 +1,6 @@ plugins { id('java') - id('io.rockcrafters.rockcraft') + id('io.github.rockcrafters.rockcraft') } rockcraft { diff --git a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/beryx-project-build.in b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/beryx-project-build.in index 0472a53..2ce7534 100644 --- a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/beryx-project-build.in +++ b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/beryx-project-build.in @@ -1,7 +1,7 @@ plugins { id('java') id('org.beryx.jlink') version "2.24.1" - id('io.rockcrafters.rockcraft') + id('io.github.rockcrafters.rockcraft') } version = 0.01 diff --git a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/beryx-runtime-project-build.in b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/beryx-runtime-project-build.in index 4820727..7ac32ff 100644 --- a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/beryx-runtime-project-build.in +++ b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/beryx-runtime-project-build.in @@ -1,6 +1,6 @@ plugins { id('org.beryx.runtime') version "1.12.5" - id('io.rockcrafters.rockcraft') + id('io.github.rockcrafters.rockcraft') } version = 0.01 diff --git a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/build-rock-java-11.in b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/build-rock-java-11.in index f1423e4..f6182ef 100644 --- a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/build-rock-java-11.in +++ b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/build-rock-java-11.in @@ -1,6 +1,6 @@ plugins { id('java') - id('io.rockcrafters.rockcraft') + id('io.github.rockcrafters.rockcraft') } rockcraft { diff --git a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/default-build.in b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/default-build.in index e327b10..6fea4a0 100644 --- a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/default-build.in +++ b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/default-build.in @@ -1,6 +1,6 @@ plugins { id('application') - id('io.rockcrafters.rockcraft') + id('io.github.rockcrafters.rockcraft') } jar { diff --git a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/rockcraft-plugin-options.in b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/rockcraft-plugin-options.in index 54b4bf2..b54da7f 100644 --- a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/rockcraft-plugin-options.in +++ b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/rockcraft-plugin-options.in @@ -1,6 +1,6 @@ plugins { id('java') - id('io.rockcrafters.rockcraft') + id('io.github.rockcrafters.rockcraft') } rockcraft { diff --git a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/single-rock1.in b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/single-rock1.in index 77fc757..aa96a3b 100644 --- a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/single-rock1.in +++ b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/single-rock1.in @@ -1,6 +1,6 @@ plugins { id('java') - id('io.rockcrafters.rockcraft') + id('io.github.rockcrafters.rockcraft') } version = 0.01 diff --git a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/single-rock2.in b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/single-rock2.in index b2a155d..4b8dcff 100644 --- a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/single-rock2.in +++ b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/single-rock2.in @@ -1,6 +1,6 @@ plugins { id('java') - id('io.rockcrafters.rockcraft') + id('io.github.rockcrafters.rockcraft') } version = '0.02updated' diff --git a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/spring-boot-project.in b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/spring-boot-project.in index 4b75fee..f5a5f2e 100644 --- a/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/spring-boot-project.in +++ b/rockcraft-gradle/src/test/resources/com/canonical/rockcraft/gradle/spring-boot-project.in @@ -2,7 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '2.7.18' id 'io.spring.dependency-management' version '1.1.6' - id 'io.rockcrafters.rockcraft' + id 'io.github.rockcrafters.rockcraft' } group = 'com.example'