Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow codestarts to be manually selected in CreateProject command #12318

Merged
merged 1 commit into from
Sep 24, 2020
Merged

Allow codestarts to be manually selected in CreateProject command #12318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions ...descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/codestart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ language:
guide: https://quarkus.io/guides/gradle-tooling
guide-native: https://quarkus.io/guides/gradle-tooling#building-a-native-executable
cmd:
dev: ./gradlew quarkusDev
package: ./gradlew quarkusBuild
package-uberjar: ./gradlew quarkusBuild --uber-jar
package-native: ./gradlew build -Dquarkus.package.type=native
package-native-container: ./gradlew build -Dquarkus.package.type=native -Dquarkus.native.container-build=true
dev: gradle quarkusDev
package: gradle quarkusBuild
package-uberjar: gradle quarkusBuild --uber-jar
package-native: gradle build -Dquarkus.package.type=native
package-native-container: gradle build -Dquarkus.package.type=native -Dquarkus.native.container-build=true
kotlin:
dependencies:
- org.jetbrains.kotlin:kotlin-stdlib-jdk8
Expand Down
6 changes: 6 additions & 0 deletions ...jects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class CreateProject {
public static final String NO_DOCKERFILES = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "no-dockerfiles");
public static final String NO_BUILDTOOL_WRAPPER = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "no-buildtool-wrapper");
public static final String NO_EXAMPLES = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "no-examples");
public static final String CODESTARTS = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "codestarts");

private static final Pattern JAVA_VERSION_PATTERN = Pattern.compile("(?:1\\.)?(\\d+)(?:\\..*)?");

Expand Down Expand Up @@ -105,6 +106,11 @@ public CreateProject extensions(Set<String> extensions) {
return this;
}

public CreateProject codestarts(Set<String> codestarts) {
setValue(CODESTARTS, codestarts);
return this;
}

public CreateProject codestartsEnabled(boolean value) {
setValue(CODESTARTS_ENABLED, value);
return this;
Expand Down
3 changes: 3 additions & 0 deletions ...mmon/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.quarkus.devtools.commands.handlers;

import static io.quarkus.devtools.commands.CreateProject.CODESTARTS;
import static io.quarkus.devtools.commands.CreateProject.CODESTARTS_ENABLED;
import static io.quarkus.devtools.commands.CreateProject.NO_BUILDTOOL_WRAPPER;
import static io.quarkus.devtools.commands.CreateProject.NO_DOCKERFILES;
Expand Down Expand Up @@ -32,6 +33,7 @@
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -78,6 +80,7 @@ public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws
final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
.addExtensions(extensionsToAdd)
.buildTool(invocation.getQuarkusProject().getBuildTool())
.addCodestarts(invocation.getValue(CODESTARTS, new HashSet<>()))
.noExamples(invocation.getValue(NO_EXAMPLES, false))
.noBuildToolWrapper(invocation.getValue(NO_BUILDTOOL_WRAPPER, false))
.noDockerfiles(invocation.getValue(NO_DOCKERFILES, false))
Expand Down