move CLI and added into package

config/groovy/BaseCommand.groovy → config/groovy/org/terasology/cli/BaseCommand.groovy

@@ -1,5 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
+package org.terasology.cli;
 
 import picocli.CommandLine.Command
 

config/groovy/Get.groovy → config/groovy/org/terasology/cli/Get.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-
+package org.terasology.cli;
 import picocli.CommandLine.ParentCommand
 import picocli.CommandLine.Command
 // Actually in use, annotation below may show syntax error due to Groovy's annotation by the same name. Works fine

config/groovy/GitOptions.groovy → config/groovy/org/terasology/cli/GitOptions.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-
+package org.terasology.cli;
 import picocli.CommandLine.Option
 
 /**

config/groovy/GooeyCLI.groovy → config/groovy/org/terasology/cli/GooeyCLI.groovy

@@ -1,5 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
+package org.terasology.cli
 
 // Grab the Groovy extensions for PicoCLI - in IntelliJ Alt-ENTER on a `@Grab` to register contents for syntax highlighting
 @Grab('info.picocli:picocli-groovy:4.3.2')

config/groovy/Init.groovy → config/groovy/org/terasology/cli/Init.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-
+package org.terasology.cli;
 import picocli.CommandLine.Command
 import picocli.CommandLine.Help.Ansi
 // Is in use, IDE may think the Groovy-supplied is in use below and mark this unused

config/groovy/ItemCommand.groovy → config/groovy/org/terasology/cli/ItemCommand.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-
+package org.terasology.cli;
 /**
  * Simple command type class that indicates the command deals with "items" - nested Git roots representing application elements
  */

config/groovy/ManagedItem.groovy → config/groovy/org/terasology/cli/ManagedItem.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-
+package org.terasology.cli;
 @GrabResolver(name = 'jcenter', root = 'http://jcenter.bintray.com/')
 @Grab(group = 'org.ajoberstar', module = 'grgit', version = '1.9.3')
 import org.ajoberstar.grgit.Grgit

config/groovy/ManagedModule.groovy → config/groovy/org/terasology/cli/ManagedModule.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-
+package org.terasology.cli;
 class ManagedModule extends ManagedItem {
     ManagedModule() {
         super()

config/groovy/Module.groovy → config/groovy/org/terasology/cli/Module.groovy

@@ -1,5 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
+package org.terasology.cli;
 
 import picocli.CommandLine.Command
 import picocli.CommandLine.HelpCommand

config/groovy/PropHelper.groovy → config/groovy/org/terasology/cli/PropHelper.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-
+package org.terasology.cli;
 /**
  * Convenience class for pulling properties out of a 'gradle.properties' if present, for various overrides
  * // TODO: YAML variant that can be added for more complex use cases?

config/groovy/Recurse.groovy → config/groovy/org/terasology/cli/Recurse.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-
+package org.terasology.cli;
 import picocli.CommandLine.ParentCommand
 import picocli.CommandLine.Command
 import picocli.CommandLine.Mixin

config/groovy/Update.groovy → config/groovy/org/terasology/cli/Update.groovy

@@ -1,6 +1,6 @@
 // Copyright 2020 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
-
+package org.terasology.cli;
 import picocli.CommandLine.ParentCommand
 import picocli.CommandLine.Command
 import picocli.CommandLine.Mixin

gw

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -180,6 +180,6 @@ save () {
 APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GroovyWrapperMain config/groovy/GooeyCLI.groovy "$APP_ARGS"
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GroovyWrapperMain config/groovy/org/terasology/cli/GooeyCLI.groovy "$APP_ARGS"
 
 exec "$JAVACMD" "$@"