From 79e1b904ca7819e59fb2dc4c6f732e4ab2c8d3a0 Mon Sep 17 00:00:00 2001 From: Inaki Villar Date: Fri, 16 Jan 2026 16:32:01 -0800 Subject: [PATCH] including 9.3.0 --- README.md | 4 ++-- backend/server.cjs | 2 +- .../github/cdsap/projectgenerator/cli/Main.kt | 3 ++- .../cdsap/projectgenerator/ProjectGenerator.kt | 2 +- .../cdsap/projectgenerator/model/Gradle.kt | 3 ++- .../src/main/resources/gradle_9_3_0.zip | Bin 0 -> 47518 bytes .../ProjectGeneratorE2EAgp9Test.kt | 2 +- .../ProjectGeneratorE2EJdk21Test.kt | 2 +- .../projectgenerator/ProjectGeneratorE2ETest.kt | 4 ++-- .../projectgenerator/SingleE2EValidationTest.kt | 4 ++-- .../BuildFilesGeneratorAndroidTest.kt | 4 ++-- .../buildfiles/BuildFilesGeneratorJvmTest.kt | 4 ++-- .../generator/test/TestGeneratorAndroidTest.kt | 2 +- .../generator/test/TestGeneratorJvmTest.kt | 2 +- .../writer/GradleWrapperTest.kt | 2 +- 15 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 project-generator/src/main/resources/gradle_9_3_0.zip diff --git a/README.md b/README.md index e1068d5..7b73393 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Then, you can use the versions.yaml in the `generate-project` command: - `--classes-module-type`: fixed (default), random - `--type-of-string-resources`: normal (default), large - `--generate-unit-test`: Generate unit tests (default: false) -- `--gradle`: gradle_8_13, gradle_8_14_3, gradle_9_0_0, gradle_9_1_0, gradle_9_2_0 (default: gradle_9_2_0) +- `--gradle`: gradle_8_13, gradle_8_14_3, gradle_9_0_0, gradle_9_1_0, gradle_9_2_0, gradle_9_3_0 (default: gradle_9_3_0) - `--develocity`: Enables the Develocity build scan plugin (default: false). If --develocity-url is not specified, the build scan will be published to Gradle Scans. - `--develocity-url`: Specify Develocity URL - `--versions-file`: Path to a custom YAML file with dependency versions @@ -70,7 +70,7 @@ ProjectGenerator( typeOfStringResources = TypeOfStringResources.LARGE, layers = 5, generateUnitTest = true, - gradle = GradleWrapper(Gradle.GRADLE_9_2_0), + gradle = GradleWrapper(Gradle.GRADLE_9_3_0), path = file.path ).write() diff --git a/backend/server.cjs b/backend/server.cjs index 1707b42..cd1c529 100644 --- a/backend/server.cjs +++ b/backend/server.cjs @@ -62,7 +62,7 @@ app.post('/api/generate', upload.single('versions-file'), async (req, res) => { `--classes-module`, Math.min(parseInt(body['classes-module']) || 15, 15), `--classes-module-type`, body['classes-module-type'] || 'fixed', `--type-of-string-resources`, body['type-of-string-resources'] || 'normal', - `--gradle`, body.gradle || 'GRADLE_9_2_0' + `--gradle`, body.gradle || 'GRADLE_9_3_0' ]; // Add project name if provided diff --git a/cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/Main.kt b/cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/Main.kt index edfccc2..dce446f 100644 --- a/cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/Main.kt +++ b/cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/Main.kt @@ -49,8 +49,9 @@ class GenerateProjects : CliktCommand(name = "generate-project") { "gradle_9_0_0", "gradle_9_1_0", "gradle_9_2_0", + "gradle_9_3_0", ) - .default("gradle_9_2_0") + .default("gradle_9_3_0") private val develocity by option().flag(default = false) private val versionsFile by option().file() private val projectName by option() diff --git a/project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/ProjectGenerator.kt b/project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/ProjectGenerator.kt index 019a70c..d105bfb 100644 --- a/project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/ProjectGenerator.kt +++ b/project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/ProjectGenerator.kt @@ -15,7 +15,7 @@ class ProjectGenerator( private val typeOfStringResources: TypeOfStringResources = TypeOfStringResources.NORMAL, private val layers: Int, private val generateUnitTest: Boolean = false, - private val gradle: GradleWrapper = GradleWrapper(Gradle.GRADLE_9_2_0), + private val gradle: GradleWrapper = GradleWrapper(Gradle.GRADLE_9_3_0), private val path: String = "projects_generated", private val develocity: Boolean = false, private val layerNames: List = DefaultNames.layerNames, diff --git a/project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/model/Gradle.kt b/project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/model/Gradle.kt index c41f79e..25772ba 100644 --- a/project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/model/Gradle.kt +++ b/project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/model/Gradle.kt @@ -5,5 +5,6 @@ enum class Gradle { GRADLE_8_14_3, GRADLE_9_0_0, GRADLE_9_1_0, - GRADLE_9_2_0 + GRADLE_9_2_0, + GRADLE_9_3_0 } diff --git a/project-generator/src/main/resources/gradle_9_3_0.zip b/project-generator/src/main/resources/gradle_9_3_0.zip new file mode 100644 index 0000000000000000000000000000000000000000..1c0e58de2621cf112060c4deb69328683b6e7dd5 GIT binary patch literal 47518 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 I%Rff{3)DYT`2YX_ literal 0 HcmV?d00001 diff --git a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/ProjectGeneratorE2EAgp9Test.kt b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/ProjectGeneratorE2EAgp9Test.kt index ab715fe..d74714d 100644 --- a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/ProjectGeneratorE2EAgp9Test.kt +++ b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/ProjectGeneratorE2EAgp9Test.kt @@ -38,7 +38,7 @@ class ProjectGeneratorE2EAgp9Test { TypeOfStringResources.LARGE, 5, true, - GradleWrapper(Gradle.GRADLE_9_2_0), + GradleWrapper(Gradle.GRADLE_9_3_0), path = tempDir.toFile().path, false, projectName = "${shape.name.lowercase().capitalize()}$modules" diff --git a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/ProjectGeneratorE2EJdk21Test.kt b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/ProjectGeneratorE2EJdk21Test.kt index 707be46..cad8bde 100644 --- a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/ProjectGeneratorE2EJdk21Test.kt +++ b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/ProjectGeneratorE2EJdk21Test.kt @@ -35,7 +35,7 @@ class ProjectGeneratorE2EJdk21Test { TypeOfStringResources.LARGE, 5, true, - GradleWrapper(Gradle.GRADLE_9_2_0), + GradleWrapper(Gradle.GRADLE_9_3_0), path = tempDir.toFile().path, false, projectName = "${shape.name.lowercase().capitalize()}$modules" diff --git a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/ProjectGeneratorE2ETest.kt b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/ProjectGeneratorE2ETest.kt index 1eefd2a..6332c77 100644 --- a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/ProjectGeneratorE2ETest.kt +++ b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/ProjectGeneratorE2ETest.kt @@ -38,7 +38,7 @@ class ProjectGeneratorE2ETest { TypeOfStringResources.LARGE, 5, true, - GradleWrapper(Gradle.GRADLE_9_2_0), + GradleWrapper(Gradle.GRADLE_9_3_0), path = tempDir.toFile().path, false, projectName = "${shape.name.lowercase().capitalize()}$modules" @@ -133,7 +133,7 @@ class ProjectGeneratorE2ETest { TypeOfStringResources.LARGE, 5, true, - GradleWrapper(Gradle.GRADLE_9_2_0), + GradleWrapper(Gradle.GRADLE_9_3_0), path = tempDir.toFile().path, false, projectName = "${shape.name.lowercase().capitalize()}$modules" diff --git a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/SingleE2EValidationTest.kt b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/SingleE2EValidationTest.kt index 0798a89..6ea4d4f 100644 --- a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/SingleE2EValidationTest.kt +++ b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/SingleE2EValidationTest.kt @@ -38,7 +38,7 @@ class SingleE2EValidationTest { typeOfStringResources = TypeOfStringResources.LARGE, layers = 5, generateUnitTest = true, - gradle = GradleWrapper(Gradle.GRADLE_9_2_0), + gradle = GradleWrapper(Gradle.GRADLE_9_3_0), path = tempDir.toFile().path, projectName = "${shape.name.lowercase().capitalize()}_$modules" ).write() @@ -87,7 +87,7 @@ class SingleE2EValidationTest { typeOfStringResources = TypeOfStringResources.LARGE, layers = 5, generateUnitTest = true, - gradle = GradleWrapper(Gradle.GRADLE_9_2_0), + gradle = GradleWrapper(Gradle.GRADLE_9_3_0), path = tempDir.toFile().path, projectName = "${shape.name.lowercase().capitalize()}_$modules" ).write() diff --git a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/buildfiles/BuildFilesGeneratorAndroidTest.kt b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/buildfiles/BuildFilesGeneratorAndroidTest.kt index b3ac9bc..f27bda5 100644 --- a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/buildfiles/BuildFilesGeneratorAndroidTest.kt +++ b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/buildfiles/BuildFilesGeneratorAndroidTest.kt @@ -39,7 +39,7 @@ class BuildFilesGeneratorAndroidTest { TypeProjectRequested.ANDROID, TypeOfStringResources.NORMAL, false, - GradleWrapper(Gradle.GRADLE_9_2_0), + GradleWrapper(Gradle.GRADLE_9_3_0), false, "" ) @@ -72,7 +72,7 @@ class BuildFilesGeneratorAndroidTest { TypeProjectRequested.ANDROID, TypeOfStringResources.NORMAL, false, - GradleWrapper(Gradle.GRADLE_9_2_0), + GradleWrapper(Gradle.GRADLE_9_3_0), false, "" ) diff --git a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/buildfiles/BuildFilesGeneratorJvmTest.kt b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/buildfiles/BuildFilesGeneratorJvmTest.kt index 5f649f0..f8829de 100644 --- a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/buildfiles/BuildFilesGeneratorJvmTest.kt +++ b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/buildfiles/BuildFilesGeneratorJvmTest.kt @@ -39,7 +39,7 @@ class BuildFilesGeneratorJvmTest { TypeProjectRequested.JVM, TypeOfStringResources.NORMAL, false, - GradleWrapper(Gradle.GRADLE_9_2_0), + GradleWrapper(Gradle.GRADLE_9_3_0), false, "" ) @@ -71,7 +71,7 @@ class BuildFilesGeneratorJvmTest { TypeProjectRequested.JVM, TypeOfStringResources.NORMAL, false, - GradleWrapper(Gradle.GRADLE_9_2_0), + GradleWrapper(Gradle.GRADLE_9_3_0), false, "" ) diff --git a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/test/TestGeneratorAndroidTest.kt b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/test/TestGeneratorAndroidTest.kt index 4b62e3d..b7519b5 100644 --- a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/test/TestGeneratorAndroidTest.kt +++ b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/test/TestGeneratorAndroidTest.kt @@ -29,7 +29,7 @@ class TestGeneratorAndroidTest { TypeProjectRequested.ANDROID, TypeOfStringResources.NORMAL, true, // generateUnitTest - GradleWrapper(Gradle.GRADLE_9_2_0), + GradleWrapper(Gradle.GRADLE_9_3_0), false, "" ) diff --git a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/test/TestGeneratorJvmTest.kt b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/test/TestGeneratorJvmTest.kt index 5f3c6c8..d7b245c 100644 --- a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/test/TestGeneratorJvmTest.kt +++ b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/test/TestGeneratorJvmTest.kt @@ -29,7 +29,7 @@ class TestGeneratorJvmTest { TypeProjectRequested.JVM, TypeOfStringResources.NORMAL, true, // generateUnitTest - GradleWrapper(Gradle.GRADLE_9_2_0), + GradleWrapper(Gradle.GRADLE_9_3_0), false, "" ) diff --git a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/writer/GradleWrapperTest.kt b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/writer/GradleWrapperTest.kt index 37574ad..d232098 100644 --- a/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/writer/GradleWrapperTest.kt +++ b/project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/writer/GradleWrapperTest.kt @@ -16,7 +16,7 @@ class GradleWrapperTest { @Test fun `installGradleVersion should unzip files and make them executable`() { - val gradle = Gradle.GRADLE_9_2_0 + val gradle = Gradle.GRADLE_9_3_0 val gradleWrapper = GradleWrapper(gradle) gradleWrapper.installGradleVersion(tempDir.absolutePath)