Skip to content

Commit 3500438

Browse files
committed
Revert "fix compilation problem after upgrading to gradle 2.3-rc-1"
This reverts commit 9946b27.
1 parent 06045e3 commit 3500438

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

grails-shell/src/main/groovy/org/grails/cli/profile/DefaultProfile.groovy

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,19 @@
1414
* limitations under the License.
1515
*/
1616
package org.grails.cli.profile
17+
1718
import grails.util.CosineSimilarity
18-
import groovy.transform.CompileDynamic
19+
import grails.util.Environment
1920
import groovy.transform.CompileStatic
2021
import jline.console.completer.ArgumentCompleter
2122
import jline.console.completer.Completer
23+
import org.grails.build.parsing.CommandLine
2224
import org.grails.build.parsing.ScriptNameResolver
2325
import org.grails.cli.interactive.completers.StringsCompleter
2426
import org.grails.cli.profile.commands.CommandRegistry
2527
import org.grails.config.NavigableMap
26-
import org.yaml.snakeyaml.Yaml
28+
import org.yaml.snakeyaml.Yaml;
29+
2730
/**
2831
* Simple disk based implementation of the {@link Profile} interface
2932
*
@@ -172,7 +175,6 @@ class DefaultProfile implements Profile {
172175
}
173176
}
174177

175-
@CompileDynamic
176178
private void initialize(ProfileRepository repository) {
177179
parentProfiles = []
178180
File profileYml = new File(profileDir, "profile.yml")

grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/YamlCommandFactory.groovy

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,19 @@
1414
* limitations under the License.
1515
*/
1616
package org.grails.cli.profile.commands.factory
17+
1718
import groovy.json.JsonParserType
1819
import groovy.json.JsonSlurper
19-
import groovy.transform.CompileDynamic
2020
import groovy.transform.CompileStatic
2121
import org.grails.cli.profile.Command
2222
import org.grails.cli.profile.Profile
2323
import org.grails.cli.profile.commands.DefaultMultiStepCommand
2424
import org.grails.io.support.Resource
2525
import org.yaml.snakeyaml.Yaml
26+
27+
import java.util.regex.Pattern
28+
29+
2630
/**
2731
* A {@link CommandFactory} that can discover commands defined in YAML or JSON
2832
*
@@ -38,7 +42,6 @@ class YamlCommandFactory extends ResourceResolvingCommandFactory<Map> {
3842
final Collection<String> matchingFileExtensions = ["yml", "json"]
3943
final String fileNamePattern = /^.*\.(yml|json)$/
4044

41-
@CompileDynamic
4245
@Override
4346
protected Map readCommandFile(Resource resource) {
4447
Map data

0 commit comments

Comments
 (0)