Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/gradle-plugin-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ jobs:

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
with:
gradle-version: 9.2.1

- name: Run tests (Unix)
if: runner.os != 'Windows'
Expand Down
10 changes: 5 additions & 5 deletions packages/common/src/lib/versions/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//Kotlin
export const kotlinVersion = '1.9.21';
export const kotlinVersion = '2.2.21';

//Spring boot
export const springBootVersion = '3.2.0';
export const springDependencyManagementVersion = '1.1.4';
export const springBootVersion = '4.0.0-M2';
export const springDependencyManagementVersion = '1.1.7';

//Quarkus
export const quarkusVersion = '3.5.3';
Expand All @@ -15,11 +15,11 @@ export const micronautCoreVersion = '4.2.3';
export const micronautSerializationVersion = '2.4.0';
export const micronautMavenPluginVersion = '4.0.7';
export const micronautTestResourcesVersion = '2.2.0';
export const kspVersion = '1.9.21-1.0.16';
export const kspVersion = '2.2.21-2.0.4';
export const shadowVersion = '8.1.1';

//Jnxplus gradle plugin
export const jnxplusGradlePluginVersion = '0.4.0';
export const jnxplusGradlePluginVersion = '1.0.0';

//Prettier
export const prettierVersion = '^3.2.4';
Expand Down
4 changes: 3 additions & 1 deletion packages/gradle-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ repositories {

dependencies {
// Use the awesome Spock testing and specification framework
testImplementation 'org.spockframework:spock-core:2.2-groovy-3.0'
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

gradlePlugin {
Expand All @@ -47,6 +48,7 @@ sourceSets {
}

configurations.functionalTestImplementation.extendsFrom(configurations.testImplementation)
configurations.functionalTestRuntimeOnly.extendsFrom(configurations.testRuntimeOnly)

// Add a task to run the functional tests
tasks.register('functionalTest', Test) {
Expand Down
2 changes: 1 addition & 1 deletion packages/gradle-plugin/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=0.4.0
version=1.0.0
Binary file modified packages/gradle-plugin/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello, for consistent Gradle updates across all related files, I recommend the following command:

./gradlew wrapper --gradle-version=9.2.1 && ./gradlew wrapper

This ensures the Gradle version is updated and all wrapper files are regenerated accordingly. (Documentation)

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
15 changes: 7 additions & 8 deletions packages/gradle-plugin/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 13 additions & 12 deletions packages/gradle-plugin/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ abstract class ProjectDependencyTask extends DefaultTask {


def result = [
pluginVersion: "0.4.0",
pluginVersion: "1.0.0",
projects : projects
]

Expand Down Expand Up @@ -69,19 +69,22 @@ abstract class ProjectDependencyTask extends DefaultTask {
l: {
element = (ProjectDependency) element

// Use the new Gradle 9 compatible API
Project depProject = currentProject.project(element.path)

String projectDependencyName = element.name
File projectDependencyJsonFile = element.dependencyProject.file('project.json')
File projectDependencyJsonFile = depProject.file('project.json')
boolean isProjectDependencyJsonExists = projectDependencyJsonFile.exists()

if (isProjectDependencyJsonExists) {
def projectDependencyJson = new JsonSlurper().parse(projectDependencyJsonFile)
projectDependencyName = projectDependencyJson.name
}

return [relativePath : currentProject.rootProject.relativePath(element.dependencyProject.projectDir),
return [relativePath : currentProject.rootProject.relativePath(depProject.projectDir),
name : projectDependencyName,
isProjectJsonExists: isProjectDependencyJsonExists,
isBuildGradleExists: element.dependencyProject.file('build.gradle').exists()]
isBuildGradleExists: depProject.file('build.gradle').exists()]
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ repositories {
dependencies {
testImplementation 'io.micronaut.test:micronaut-test-junit5'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

java {
Expand All @@ -38,6 +39,7 @@ repositories {
dependencies {
testImplementation("io.micronaut.test:micronaut-test-junit5")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

java {
Expand All @@ -62,6 +64,7 @@ repositories {
dependencies {
testImplementation mn.micronaut.test.junit5
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
}

java {
Expand All @@ -84,6 +87,7 @@ repositories {
dependencies {
testImplementation(mn.micronaut.test.junit5)
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

java {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}"
testImplementation 'io.micronaut.test:micronaut-test-junit5'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

java {
Expand Down Expand Up @@ -53,6 +54,7 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
testImplementation("io.micronaut.test:micronaut-test-junit5")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

java {
Expand Down Expand Up @@ -83,6 +85,7 @@ dependencies {
implementation mn.kotlin.stdlib.jdk8
testImplementation mn.micronaut.test.junit5
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
}

java {
Expand Down Expand Up @@ -112,6 +115,7 @@ dependencies {
implementation(mn.kotlin.stdlib.jdk8)
testImplementation(mn.micronaut.test.junit5)
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

java {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ repositories {

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

application {
Expand Down Expand Up @@ -41,6 +42,7 @@ repositories {

dependencies {
testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

application {
Expand Down Expand Up @@ -68,6 +70,7 @@ repositories {

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

application {
Expand All @@ -93,6 +96,7 @@ repositories {

dependencies {
testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

application {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ repositories {
dependencies {
testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

application {
Expand Down Expand Up @@ -45,6 +46,7 @@ repositories {
dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.1")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

application {
Expand Down Expand Up @@ -74,6 +76,7 @@ repositories {
dependencies {
testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

application {
Expand Down Expand Up @@ -101,6 +104,7 @@ repositories {
dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.1")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

application {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ repositories {

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

tasks.named('test') {
Expand All @@ -38,6 +39,7 @@ repositories {

dependencies {
testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

tasks.named<Test>("test") {
Expand All @@ -61,6 +63,7 @@ repositories {

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

tasks.named('test') {
Expand All @@ -83,6 +86,7 @@ repositories {

dependencies {
testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

tasks.named<Test>("test") {
Expand Down
Loading
Loading