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 0000000..1c0e58d Binary files /dev/null and b/project-generator/src/main/resources/gradle_9_3_0.zip differ 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)