Skip to content

Commit

Permalink
Merge pull request #2 from vpa1977/rename-plugin
Browse files Browse the repository at this point in the history 
chore: rename plugin
  • Loading branch information
@vpa1977
vpa1977 authored Oct 4, 2024
2 parents 946af0e + cddf75f commit 4ad7d28
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 37 deletions.
12 changes: 6 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ To use the plugin, apply the following two steps:
**Groovy**

plugins {
id 'com.canonical.rockcraft' version '0.1.1'
id 'io.rockcrafters.rockcraft' version '0.1.1'
}

**Kotlin**

plugins {
id("com.canonical.rockcraft") version "0.1.1"
id("io.rockcrafters.rockcraft") version "0.1.1"
}

##### Alternatively, you can use the `buildscript` DSL:
Expand All @@ -39,10 +39,10 @@ To use the plugin, apply the following two steps:
}
}
dependencies {
classpath 'com.canonical.rockcraft:0..1'
classpath 'io.rockcrafters.rockcraft:0.1.1'
}
}
apply plugin: 'com.canonical.rockcraft-plugin'
apply plugin: 'io.rockcrafters.rockcraft-plugin'

**Kotlin**

Expand All @@ -53,10 +53,10 @@ To use the plugin, apply the following two steps:
}
}
dependencies {
classpath("com.canonical.rockcraft:0.1.1")
classpath("io.rockcrafters.rockcraft:0.1.1")
}
}
apply(plugin = "com.canonical.rockcraft")
apply(plugin = "io.rockcrafters.rockcraft")

### 2. Configure ROCK container

Expand Down
4 changes: 2 additions & 2 deletions rockcraft-gradle/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id("com.gradle.plugin-publish") version "1.3.0"
}

group = "com.canonical"
group = "io.rockcrafters"
version = "0.1.1"

repositories {
Expand All @@ -29,7 +29,7 @@ gradlePlugin {

plugins {
create("rockcraftPlugin") {
id = "com.canonical.rockcraft"
id = "io.rockcrafters.rockcraft"
displayName = "Rockcraft plugin"
description = "Plugin for rock image generation"
implementationClass = "com.canonical.rockcraft.gradle.RockcraftPlugin"
Expand Down
2 changes: 1 addition & 1 deletion rockcraft-gradle/src/test/java/com/canonical/rockcraft/gradle/BaseRockcraftTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public static void main(String[] args) {
"""
plugins {
id('application')
id('com.canonical.rockcraft')
id('io.rockcrafters.rockcraft')
}
""");
}
Expand Down
40 changes: 20 additions & 20 deletions rockcraft-gradle/src/test/java/com/canonical/rockcraft/gradle/RockcraftPluginTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ void buildRockJava11Test() throws IOException {
writeString(getBuildFile(), """
plugins {
id('java')
id('com.canonical.rockcraft')
id('io.rockcrafters.rockcraft')
}
rockcraft {
buildPackage = "openjdk-11-jdk"
targetRelease = 11
}
""");
var result = runBuild("build-rock");
assertTrue(true); // the build needs to succeed
Expand All @@ -76,14 +76,14 @@ void rockcraftPluginOptions() throws IOException {
writeString(getBuildFile(), """
plugins {
id('java')
id('com.canonical.rockcraft')
id('io.rockcrafters.rockcraft')
}
rockcraft {
summary = "Foobar"
description = "readme.txt"
}
""");
writeString(new File(getProjectDir(), "readme.txt"), """
This is a multiline description
Expand All @@ -102,14 +102,14 @@ void testArchitecture() throws IOException {
writeString(getBuildFile(), """
plugins {
id('java')
id('com.canonical.rockcraft')
id('io.rockcrafters.rockcraft')
}
rockcraft {
summary = "Foobar"
architectures = [ "amd64", "arm64" ]
}
""");
runBuild("jar", "create-rock");

Expand All @@ -127,14 +127,14 @@ void onlySingleRockExists() throws IOException {
writeString(getBuildFile(), """
plugins {
id('java')
id('com.canonical.rockcraft')
id('io.rockcrafters.rockcraft')
}
version = 0.01
rockcraft {
}
""");
runBuild("build-rock");
File output = Path.of(getProjectDir().getAbsolutePath(), "build", "rock").toFile();
Expand All @@ -143,14 +143,14 @@ void onlySingleRockExists() throws IOException {
writeString(getBuildFile(), """
plugins {
id('java')
id('com.canonical.rockcraft')
id('io.rockcrafters.rockcraft')
}
version = '0.02updated'
rockcraft {
}
""");
runBuild("build-rock");
String[] rocks = output.list((dir, name) -> name.endsWith("rock"));
Expand All @@ -164,11 +164,11 @@ void testAllOptions() throws IOException {
writeString(getBuildFile(), """
plugins {
id('java')
id('com.canonical.rockcraft')
id('io.rockcrafters.rockcraft')
}
version = 0.01
rockcraft {
buildPackage = 'openjdk-17-jdk'
targetRelease = 17
Expand Down
16 changes: 8 additions & 8 deletions rockcraft-gradle/src/test/java/com/canonical/rockcraft/gradle/SpringBootTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ public class SpringBootTest extends BaseRockcraftTest {
protected void setUp() throws IOException {
String app = """
package com.example.app2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class DemoApplication {
public static void main(String[] args) {
SpringApplication.run(DemoApplication.class, args);
}
}
""";
Path javaDir = Path.of(projectDir.getAbsolutePath(), "src", "main", "java", "com", "example", "app2");
Expand All @@ -53,16 +53,16 @@ public static void main(String[] args) {
id 'java'
id 'org.springframework.boot' version '3.3.2'
id 'io.spring.dependency-management' version '1.1.6'
id 'com.canonical.rockcraft'
id 'io.rockcrafters.rockcraft'
}
group = 'com.example'
version = '0.0.1-SNAPSHOT'
repositories {
mavenCentral()
}
dependencies {
implementation 'org.springframework.boot:spring-boot-starter'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
Expand Down

0 comments on commit 4ad7d28

Please sign in to comment.