Skip to content

Commit 9efd72c

Browse files
authored
Merge pull request #205 from cedricziel/2018-2
Update dependencies to 2018.2
2 parents a6d769d + 3706da5 commit 9efd72c

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ cache:
1717
matrix:
1818
include:
1919
- env: IDEA_VERSION="IU-2018.1.5" PHP_PLUGIN_VERSION="181.5281.35" PSI_VIEWER_PLUGIN_VERSION="2018.1.2" SINCE_BUILD="181" UNTIL_BUILD="181.*"
20-
- env: IDEA_VERSION="IU-182.3684.40" PHP_PLUGIN_VERSION="182.3684.40" PSI_VIEWER_PLUGIN_VERSION="182.2757.2" SINCE_BUILD="182" UNTIL_BUILD="182.*"
21-
allow_failures:
22-
- env: IDEA_VERSION="IU-182.3684.40" PHP_PLUGIN_VERSION="182.3684.40" PSI_VIEWER_PLUGIN_VERSION=182.2757.2 SINCE_BUILD="182" UNTIL_BUILD="182.*"
20+
- env: IDEA_VERSION="IU-2018.2" PHP_PLUGIN_VERSION="182.3684.41" PSI_VIEWER_PLUGIN_VERSION="182.2757.2" SINCE_BUILD="182" UNTIL_BUILD="182.*"
21+
# allow_failures:
22+
# - env: IDEA_VERSION="IU-182.3684.40" PHP_PLUGIN_VERSION="182.3684.40" PSI_VIEWER_PLUGIN_VERSION=182.2757.2 SINCE_BUILD="182" UNTIL_BUILD="182.*"
2323

2424
before_install:
2525
- "export ORG_GRADLE_PROJECT_ideaVersion=${IDEA_VERSION}"
26-
- "export ORG_GRADLE_PROJECT_ideaType=${IDEA_TYPE}"
2726
- "export ORG_GRADLE_PROJECT_phpPluginVersion=${PHP_PLUGIN_VERSION}"
2827
- "export ORG_GRADLE_PROJECT_psiViewerPluginVersion=${PSI_VIEWER_PLUGIN_VERSION}"
2928
- "export ORG_GRADLE_PROJECT_customSinceBuild=${SINCE_BUILD}"

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ customUntilBuild = 182.*
99
jFlexRelease = 1.7.0-1
1010
grammarKitPluginVersion = 2018.1.3
1111

12-
ideaVersion = IU-182.3684.40
13-
phpPluginVersion = 182.3684.40
12+
ideaVersion = IU-2018.2
13+
phpPluginVersion = 182.3684.41
1414
psiViewerPluginVersion = 182.2757.2
1515

1616
#ideaVersion = IU-2018.1.5

0 commit comments

Comments
 (0)