Skip to content

Commit c2f945b

Browse files
committed
Merge branch 'feature/phpstorm-2019-1' into feature/lang-injector
2 parents 5b08f2b + 7a38251 commit c2f945b

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ before_install:
2222
- "export ORG_GRADLE_PROJECT_annotationPluginVersion=${ANNOTATION_PLUGIN_VERSION}"
2323

2424
env:
25-
- PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-183.2153.8" PHP_PLUGIN_VERSION="183.2153.44" TWIG_PLUGIN_VERSION="183.2153.44" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
26-
- PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2018.2.5" PHP_PLUGIN_VERSION="182.4892.16" TWIG_PLUGIN_VERSION="182.3458.35" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
27-
- PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2018.2" PHP_PLUGIN_VERSION="182.3684.42" TWIG_PLUGIN_VERSION="182.3458.35" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
25+
- PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-191.6707.31-EAP-SNAPSHOT" PHP_PLUGIN_VERSION="191.6707.42" TWIG_PLUGIN_VERSION="191.6183.95" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
26+
- PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2019.1" PHP_PLUGIN_VERSION="191.6183.95" TWIG_PLUGIN_VERSION="191.6183.95" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
2827

2928
script:
3029
- "./gradlew check verifyPlugin buildPlugin"

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ intellij {
3838
}
3939

4040
patchPluginXml {
41-
sinceBuild '182'
41+
sinceBuild '191'
4242
changeNotes = htmlFixer('src/main/resources/META-INF/change-notes.html')
4343
}
4444

gradle.properties

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1-
#ideaVersion = IU-183.2153.8
2-
#phpPluginVersion = 183.2153.44
3-
#twigPluginVersion = 183.2153.44
1+
# 2019.1.1 RC
2+
#ideaVersion = IU-191.6707.31-EAP-SNAPSHOT
3+
#phpPluginVersion = 191.6707.42
4+
#twigPluginVersion = 191.6183.95
45
#toolboxPluginVersion = 0.4.6
56
#annotationPluginVersion = 5.3
67

7-
ideaVersion = IU-2018.2
8-
phpPluginVersion = 182.3684.42
9-
twigPluginVersion = 182.3458.35
8+
ideaVersion = IU-2019.1
9+
phpPluginVersion = 191.6183.95
10+
twigPluginVersion = 191.6183.95
1011
toolboxPluginVersion = 0.4.6
1112
annotationPluginVersion = 5.3
1213

13-
#ideaVersion = IU-2018.1
14-
#phpPluginVersion = 181.4203.565
15-
#twigPluginVersion = 181.3741.23
14+
#ideaVersion = IU-2018.3.6
15+
#phpPluginVersion = 183.6156.29
16+
#twigPluginVersion = 183.3795.24
1617
#toolboxPluginVersion = 0.4.6
1718
#annotationPluginVersion = 5.3
1819

19-
#ideaVersion = IU-2017.3.5
20-
#phpPluginVersion = 173.4301.34
21-
#twigPluginVersion = 173.4301.7
20+
#ideaVersion = IU-2018.3
21+
#phpPluginVersion = 183.4284.150
22+
#twigPluginVersion = 183.3795.24
2223
#toolboxPluginVersion = 0.4.6
23-
#annotationPluginVersion = 5.2.1
24+
#annotationPluginVersion = 5.3
25+

0 commit comments

Comments
 (0)