Merge pull request #147 from Haehnchen/feature/phpstorm-gradle-update

gradle and Intellij version updates for travis

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 before_cache:
 - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -21,9 +21,7 @@ before_install:
 - "export ORG_GRADLE_PROJECT_twigPluginVersion=${TWIG_PLUGIN_VERSION}"
 
 env:
-  - IDEA_VERSION="IU-183.3283.2" PHP_PLUGIN_VERSION="183.3283.10" TOOLBOX_PLUGIN_VERSION="0.4.6" TWIG_PLUGIN_VERSION="183.3283.10"
-  - IDEA_VERSION="IU-2018.2.4" PHP_PLUGIN_VERSION="182.4505.42" TOOLBOX_PLUGIN_VERSION="0.4.6" TWIG_PLUGIN_VERSION="182.3341.34"
-  - IDEA_VERSION="IU-2018.1" PHP_PLUGIN_VERSION="181.4203.565" TOOLBOX_PLUGIN_VERSION="0.4.6" TWIG_PLUGIN_VERSION="181.3741.23"
+  - IDEA_VERSION="IU-2019.1.2" PHP_PLUGIN_VERSION="191.7141.52" TOOLBOX_PLUGIN_VERSION="0.4.6" TWIG_PLUGIN_VERSION="191.6183.95"
 
 script:
 - "./gradlew check verifyPlugin buildPlugin"

build.gradle

@@ -3,13 +3,21 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 buildscript {
     repositories {
         mavenCentral()
+        maven {
+            url "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+        maven {
+            url 'https://dl.bintray.com/jetbrains/intellij-plugin-service'
+        }
 
-        maven { url 'http://dl.bintray.com/jetbrains/intellij-plugin-service' }
+    }
+    dependencies {
+        classpath "org.jetbrains.intellij.plugins:gradle-intellij-plugin:0.5.0-SNAPSHOT"
     }
 }
 
 plugins {
-    id "org.jetbrains.intellij" version "0.3.11"
+    id "org.jetbrains.intellij" version "0.4.8"
     id 'com.palantir.git-version' version "0.11.0"
 }
 
@@ -31,11 +39,20 @@ intellij {
             'properties'
     ]
     pluginName 'PHP Annotations'
+
+
+    // Can't instantiate configurable for PHP Toolbox 
+    // at de.espend.idea.php.toolbox.ui.application.ToolboxApplicationForm.<init>(ToolboxApplicationForm.java:26)
+    tasks {
+        "buildSearchableOptions" {
+            enabled = false
+        }
+    }
 }
 
 patchPluginXml {
     changeNotes = htmlFixer('src/main/resources/META-INF/change-notes.html')
-    sinceBuild '181'
+    sinceBuild '191'
 }
 
 publishPlugin {
@@ -53,7 +70,7 @@ if (details.isCleanTag) {
 }
 
 wrapper {
-    gradleVersion '4.3.1'
+    gradleVersion '5.4.1'
 }
 
 test.testLogging.exceptionFormat = TestExceptionFormat.FULL

gradle.properties

@@ -1,14 +1,4 @@
-#ideaVersion = IU-183.3283.2
-#phpPluginVersion = 183.3283.10
-#twigPluginVersion = 183.3283.10
-#toolboxPluginVersion = 0.4.6
-
-ideaVersion = IU-2018.2.4
-phpPluginVersion = 182.4505.42
-twigPluginVersion = 182.3341.34
+ideaVersion = IU-2019.1
+phpPluginVersion = 191.6183.95
+twigPluginVersion = 191.6183.95
 toolboxPluginVersion = 0.4.6
-
-#ideaVersion = IU-2018.1
-#phpPluginVersion = 181.4203.565
-#twigPluginVersion = 181.3741.23
-#toolboxPluginVersion = 0.4.6

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Oct 05 11:58:17 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome