Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate Project structure to use gradle #1164

Merged
merged 15 commits into from
Apr 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
out/
/.idea
/.idea/misc.xml
/.gradle
/build
34 changes: 20 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,28 @@ sudo: false
language: java
jdk:
- oraclejdk8

script: "./travis.sh"

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
- rm -fr $HOME/.gradle/caches/*/fileHashes/fileHashes.bin
- rm -fr $HOME/.gradle/caches/*/fileHashes/fileHashes.lock

cache:
directories:
- .cache
before_script:
- sudo apt-get -qq update
- sudo apt-get install ant-optional
- chmod +x travis.sh
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/

before_install:
- "export ORG_GRADLE_PROJECT_ideaVersion=${IDEA_VERSION}"
- "export ORG_GRADLE_PROJECT_phpPluginVersion=${PHP_PLUGIN_VERSION}"
- "export ORG_GRADLE_PROJECT_twigPluginVersion=${TWIG_PLUGIN_VERSION}"
- "export ORG_GRADLE_PROJECT_toolboxPluginVersion=${TOOLBOX_PLUGIN_VERSION}"
- "export ORG_GRADLE_PROJECT_annotationPluginVersion=${ANNOTATION_PLUGIN_VERSION}"

env:
#- PHPSTORM_ENV=2017.2 # unsupported api
#- PHPSTORM_ENV=2017.2.4 # unsupported api
- PHPSTORM_ENV=2017.3.2
#- PHPSTORM_ENV=eap # disabled never used
- 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"
- 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"

matrix:
allow_failures:
- env: PHPSTORM_ENV=eap
script:
- "./gradlew check buildPlugin"
224 changes: 0 additions & 224 deletions build-test.xml

This file was deleted.

48 changes: 48 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import org.gradle.api.tasks.testing.logging.TestExceptionFormat

buildscript {
repositories {
mavenCentral()

maven { url 'http://dl.bintray.com/jetbrains/intellij-plugin-service' }
}
}

plugins {
id "org.jetbrains.intellij" version "0.2.18"
}

apply plugin: 'idea'
apply plugin: 'org.jetbrains.intellij'
apply plugin: 'java'

intellij {
version ideaVersion
plugins = [
"com.jetbrains.php:${phpPluginVersion}",
"com.jetbrains.twig:${twigPluginVersion}",
"de.espend.idea.php.annotation:${annotationPluginVersion}",
"de.espend.idea.php.toolbox:${toolboxPluginVersion}",
'coverage',
'webDeployment',
'yaml',
'CSS',
'java-i18n',
'properties'
]
pluginName 'Symfony Plugin'

patchPluginXml {
sinceBuild '173'
untilBuild '181.*'
}
}

group 'fr.adrienbrault.idea.symfony2plugin'
version '0.16.165'

wrapper {
gradleVersion '4.3.1'
}

test.testLogging.exceptionFormat = TestExceptionFormat.FULL
10 changes: 10 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ideaVersion = IU-2018.1
phpPluginVersion = 181.4203.565
twigPluginVersion = 181.3741.23
toolboxPluginVersion = 0.4.6
annotationPluginVersion = 5.3
#ideaVersion = IU-2017.3.5
#phpPluginVersion = 173.4301.34
#twigPluginVersion = 173.4301.7
#toolboxPluginVersion = 0.4.6
#annotationPluginVersion = 5.2.1
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 6 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Thu Mar 22 15:32:22 CET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
Loading