Skip to content
Merged
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
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,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_14_3, gradle_9_0_0, gradle_9_1_0, gradle_9_2_0, gradle_9_3_0, gradle_9_3_1 (default: gradle_9_3_1)
- `--gradle`: gradle_8_14_3, gradle_9_1_0, gradle_9_2_0, gradle_9_3_0, gradle_9_3_1, gradle_9_4_0 (default: gradle_9_4_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
Expand Down Expand Up @@ -186,11 +186,12 @@ If enabled, each module will generate n unit tests, where n is the argument `cla
```
## Gradle
Gradle used, versions supported:
* Gradle 8.5
* Gradle 8.9
* Gradle 8.13
* Gradle 8.14_2
* Gradle 9.0.0 **default**
* Gradle 8.14.3
* Gradle 9.1.0
* Gradle 9.2.0
* Gradle 9.3.0
* Gradle 9.3.1
* Gradle 9.4.0 **default**

##### Example
```kotlin
Expand Down
2 changes: 1 addition & 1 deletion backend/server.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,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_3_1'
`--gradle`, body.gradle || 'GRADLE_9_4_0'
];

// Add project name if provided
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ class GenerateProjects : CliktCommand(name = "generate-project") {
private val generateUnitTest by option().flag(default = false)
private val gradle: String by option().choice(
"gradle_8_14_3",
"gradle_9_0_0",
"gradle_9_1_0",
"gradle_9_2_0",
"gradle_9_3_0",
"gradle_9_3_1",
"gradle_9_4_0"
)
.default("gradle_9_3_1")
.default("gradle_9_4_0")
private val develocity by option().flag(default = false)
private val versionsFile by option().file()
private val projectName by option()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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_3_1),
private val gradle: GradleWrapper = GradleWrapper(Gradle.GRADLE_9_4_0),
private val path: String = "projects_generated",
private val develocity: Boolean = false,
private val layerNames: List<String> = DefaultNames.layerNames,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package io.github.cdsap.projectgenerator.model

enum class Gradle {
GRADLE_8_14_3,
GRADLE_9_0_0,
GRADLE_9_1_0,
GRADLE_9_2_0,
GRADLE_9_3_0,
GRADLE_9_3_1
GRADLE_9_3_1,
GRADLE_9_4_0
}
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.github.cdsap.projectgenerator

import io.github.cdsap.projectgenerator.DefaultTestVersions.Companion.LATEST_GRADLE
import io.github.cdsap.projectgenerator.model.Android
import io.github.cdsap.projectgenerator.model.ClassesPerModule
import io.github.cdsap.projectgenerator.model.ClassesPerModuleType
Expand Down Expand Up @@ -42,7 +43,7 @@ class AndroidKotlinMultiplatformLibraryE2EValidationTest {
typeOfStringResources = TypeOfStringResources.NORMAL,
layers = 2,
generateUnitTest = false,
gradle = GradleWrapper(Gradle.GRADLE_9_3_0),
gradle = GradleWrapper(LATEST_GRADLE),
path = tempDir.toFile().path,
projectName = projectName
).write()
Expand Down Expand Up @@ -73,7 +74,7 @@ class AndroidKotlinMultiplatformLibraryE2EValidationTest {
typeOfStringResources = TypeOfStringResources.NORMAL,
layers = 2,
generateUnitTest = false,
gradle = GradleWrapper(Gradle.GRADLE_9_3_0),
gradle = GradleWrapper(LATEST_GRADLE),
path = tempDir.toFile().path,
projectName = projectName
).write()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ import io.github.cdsap.projectgenerator.model.Versions

class DefaultTestVersions {
companion object {
val LATEST_GRADLE = Gradle.GRADLE_9_3_1
val LATEST_GRADLE = Gradle.GRADLE_9_4_0
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class ProjectGeneratorE2EAgp9Test {
TypeOfStringResources.LARGE,
5,
true,
GradleWrapper(Gradle.GRADLE_9_3_1),
GradleWrapper(DefaultTestVersions.LATEST_GRADLE),
path = tempDir.toFile().path,
false,
projectName = "${shape.name.lowercase().capitalize()}$modules"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class BuildFilesGeneratorAndroidTest {
TypeProjectRequested.ANDROID,
TypeOfStringResources.NORMAL,
true,
GradleWrapper(Gradle.GRADLE_9_3_0),
GradleWrapper(LATEST_GRADLE),
false,
""
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ class ProjectWriterTest {
TypeProjectRequested.ANDROID,
TypeOfStringResources.NORMAL,
true,
GradleWrapper(Gradle.GRADLE_9_3_0),
GradleWrapper(LATEST_GRADLE),
false,
"kmp_android_main_layout"
)
Expand Down