Skip to content

Commit 147d6d0

Browse files
cedriczielHaehnchen
cedricziel
authored and
Haehnchen
committed
Migrate Project structure to use gradle (Haehnchen#1164)
* Migrate Project structure to use gradle The project depends on the toolbox and the annotation plugin, so this will only ever build if they update first. * Use correct annotations plugin for 173 platform * Use local gradle with sources * Require IntelliJ webDeployment plugin * Require coverage plugin in build to have jdi classes available * Move icons to resources folder * Correct paths for testData * Correct more path issues * Sskip incomplete tests on travis * Force non-negative integer for offset on TwigTemplateGoToDeclarationHandler * Correct javadoc link * Rename test cases so they match the pattern but exclude them from running Those tests have previously been skipped as well, since the ant script globbed for `*Test` classes / files. * Use stable 2018.1 platform dependencies * Migrate Settings storage * Apply hacky progress indicator fix locally in test `setMerge` method visibility changed to private
1 parent 1d727c3 commit 147d6d0

File tree

1,219 files changed

+692
-737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,219 files changed

+692
-737
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
out/
22
/.idea
33
/.idea/misc.xml
4+
/.gradle
5+
/build

‎.travis.yml

+20-14
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,28 @@ sudo: false
22
language: java
33
jdk:
44
- oraclejdk8
5-
6-
script: "./travis.sh"
5+
6+
before_cache:
7+
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
8+
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
9+
- rm -fr $HOME/.gradle/caches/*/fileHashes/fileHashes.bin
10+
- rm -fr $HOME/.gradle/caches/*/fileHashes/fileHashes.lock
11+
712
cache:
813
directories:
9-
- .cache
10-
before_script:
11-
- sudo apt-get -qq update
12-
- sudo apt-get install ant-optional
13-
- chmod +x travis.sh
14+
- $HOME/.gradle/caches/
15+
- $HOME/.gradle/wrapper/
16+
17+
before_install:
18+
- "export ORG_GRADLE_PROJECT_ideaVersion=${IDEA_VERSION}"
19+
- "export ORG_GRADLE_PROJECT_phpPluginVersion=${PHP_PLUGIN_VERSION}"
20+
- "export ORG_GRADLE_PROJECT_twigPluginVersion=${TWIG_PLUGIN_VERSION}"
21+
- "export ORG_GRADLE_PROJECT_toolboxPluginVersion=${TOOLBOX_PLUGIN_VERSION}"
22+
- "export ORG_GRADLE_PROJECT_annotationPluginVersion=${ANNOTATION_PLUGIN_VERSION}"
1423

1524
env:
16-
#- PHPSTORM_ENV=2017.2 # unsupported api
17-
#- PHPSTORM_ENV=2017.2.4 # unsupported api
18-
- PHPSTORM_ENV=2017.3.2
19-
#- PHPSTORM_ENV=eap # disabled never used
25+
- PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2018.1" PHP_PLUGIN_VERSION="181.4203.565" TWIG_PLUGIN_VERSION="181.3741.23" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.3"
26+
- PHPSTORM_ENV="skip incomplete" IDEA_VERSION="IU-2017.3.5" PHP_PLUGIN_VERSION="173.4301.34" TWIG_PLUGIN_VERSION="173.4301.7" TOOLBOX_PLUGIN_VERSION="0.4.6" ANNOTATION_PLUGIN_VERSION="5.2.1"
2027

21-
matrix:
22-
allow_failures:
23-
- env: PHPSTORM_ENV=eap
28+
script:
29+
- "./gradlew check buildPlugin"

‎build-test.xml

-224
This file was deleted.

‎build.gradle

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
2+
3+
buildscript {
4+
repositories {
5+
mavenCentral()
6+
7+
maven { url 'http://dl.bintray.com/jetbrains/intellij-plugin-service' }
8+
}
9+
}
10+
11+
plugins {
12+
id "org.jetbrains.intellij" version "0.2.18"
13+
}
14+
15+
apply plugin: 'idea'
16+
apply plugin: 'org.jetbrains.intellij'
17+
apply plugin: 'java'
18+
19+
intellij {
20+
version ideaVersion
21+
plugins = [
22+
"com.jetbrains.php:${phpPluginVersion}",
23+
"com.jetbrains.twig:${twigPluginVersion}",
24+
"de.espend.idea.php.annotation:${annotationPluginVersion}",
25+
"de.espend.idea.php.toolbox:${toolboxPluginVersion}",
26+
'coverage',
27+
'webDeployment',
28+
'yaml',
29+
'CSS',
30+
'java-i18n',
31+
'properties'
32+
]
33+
pluginName 'Symfony Plugin'
34+
35+
patchPluginXml {
36+
sinceBuild '173'
37+
untilBuild '181.*'
38+
}
39+
}
40+
41+
group 'fr.adrienbrault.idea.symfony2plugin'
42+
version '0.16.165'
43+
44+
wrapper {
45+
gradleVersion '4.3.1'
46+
}
47+
48+
test.testLogging.exceptionFormat = TestExceptionFormat.FULL

‎gradle.properties

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ideaVersion = IU-2018.1
2+
phpPluginVersion = 181.4203.565
3+
twigPluginVersion = 181.3741.23
4+
toolboxPluginVersion = 0.4.6
5+
annotationPluginVersion = 5.3
6+
#ideaVersion = IU-2017.3.5
7+
#phpPluginVersion = 173.4301.34
8+
#twigPluginVersion = 173.4301.7
9+
#toolboxPluginVersion = 0.4.6
10+
#annotationPluginVersion = 5.2.1

‎gradle/wrapper/gradle-wrapper.jar

53.4 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Thu Mar 22 15:32:22 CET 2018
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip

0 commit comments

Comments
 (0)