Skip to content

Commit 7849811

Browse files
committed
renew verions in build and updateSinceUntilBuild=false, update gradle-wrapper
1 parent ec7d649 commit 7849811

File tree

5 files changed

+34
-24
lines changed

5 files changed

+34
-24
lines changed

build.gradle

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ buildscript {
66
}
77
}
88

9+
10+
911
plugins {
10-
id "org.jetbrains.intellij" version "0.2.17"
12+
id "org.jetbrains.intellij" version "0.3.12"
13+
}
14+
15+
wrapper {
16+
gradleVersion = '4.10.2'
1117
}
1218

1319
group 'antlr'
@@ -17,22 +23,24 @@ apply plugin: 'java'
1723
apply plugin: 'idea'
1824
apply plugin: 'org.jetbrains.intellij'
1925
intellij {
20-
version = '2017.2.6' //'IC-2016.3.3' // https://www.jetbrains.com/intellij-repository/releases
26+
version = '2018.2.5' //'IC-2016.3.3' // https://www.jetbrains.com/intellij-repository/releases
2127

2228
pluginName 'antlr-intellij-plugin-v4'
2329
downloadSources true
30+
updateSinceUntilBuild false
2431
}
2532

2633
def gen = file('gen')
2734
def gram = file('src/grammars')
2835

2936
idea {
30-
project {
31-
jdkName = '1.8'
32-
languageLevel = '1.8'
33-
}
37+
// project {
38+
// jdkName = '1.8'
39+
// languageLevel = '1.8'
40+
// }
3441
module {
3542
generatedSourceDirs += gen
43+
jdkName = '1.8'
3644
excludeDirs += files('.idea', 'gradle', 'lib', 'images')
3745
}
3846
}
@@ -51,7 +59,7 @@ repositories {
5159
}
5260

5361
dependencies {
54-
compile "org.antlr:antlr4:4.7" // use ANTLR version 4
62+
compile "org.antlr:antlr4:4.7.1" // use ANTLR version 4
5563
testCompile group: 'junit', name: 'junit', version: '4.11'
5664
}
5765

gradle/wrapper/gradle-wrapper.jar

1.38 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Nov 13 19:10:38 MSK 2017
1+
#Sun Oct 21 15:06:30 MSK 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

gradlew

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -154,11 +154,19 @@ if $cygwin ; then
154154
esac
155155
fi
156156

157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save () {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
160161
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162+
APP_ARGS=$(save "$@")
163163

164-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
171+
172+
exec "$JAVACMD" "$@"

gradlew.bat

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ goto fail
4949
@rem Get command-line arguments, handling Windows variants
5050

5151
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
if "%@eval[2+2]" == "4" goto 4NT_args
5352

5453
:win9xME_args
5554
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
6059
if "x%~1" == "x" goto execute
6160

6261
set CMD_LINE_ARGS=%*
63-
goto execute
64-
65-
:4NT_args
66-
@rem Get arguments from the 4NT Shell from JP Software
67-
set CMD_LINE_ARGS=%$
6862

6963
:execute
7064
@rem Setup the command line

0 commit comments

Comments
 (0)