Upgrade gradle to 5.1.1

fankins · Jan 17, 2019 · 9ef2774 · 9ef2774
1 parent 159d3eb
commit 9ef2774
Show file tree

Hide file tree

Showing 27 changed files with 49 additions and 55 deletions.
diff --git a/bench/build.gradle b/bench/build.gradle
@@ -7,8 +7,8 @@ sourceSets {
 dependencies {
     compile project(':jphp-core')
     compile project(':jphp-runtime')
-    compile project(':exts/jphp-zend-ext')
-    compile project(':exts/jphp-json-ext')
+    compile project(':exts:jphp-zend-ext')
+    compile project(':exts:jphp-json-ext')
 }
 
 mainClassName = 'php.runtime.launcher.Launcher'

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.github.jengelman.gradle.plugins:shadow:2.0.2"
+        classpath "com.github.jengelman.gradle.plugins:shadow:4.0.3"
     }
 }
 
@@ -72,7 +72,7 @@ configure(subprojects) {
         dependencies {
             testCompile 'junit:junit:4.+'
             testCompile project(':jphp-runtime')
-            testCompile project(':exts/jphp-zend-ext')
+            testCompile project(':exts:jphp-zend-ext')
         }
     }
 
@@ -146,7 +146,7 @@ configure(subprojects) {
 
     def extDir = "exts/";
 
-    if (it.name.startsWith("jphp-") || it.name.startsWith("exts/jphp-")) {
+    if (it.name.startsWith("jphp-")) {
         task jppmDist(dependsOn: 'jar') {
             doLast { jppmDist(project) }
         }

diff --git a/exts/ext-template/build.gradle b/exts/ext-template/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     // -----------------
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-firebirdsql-ext/build.gradle b/exts/jphp-firebirdsql-ext/build.gradle
@@ -1,14 +1,14 @@
 dependencies {
     provided project(":jphp-runtime")
-    compileMaven project(":exts/jphp-sql-ext")
+    compileMaven project(":exts:jphp-sql-ext")
 
     // dependencies ....
     compile group: 'org.firebirdsql.jdbc', name: 'jaybird-jdk18', version: '3.0.1'
     compile group: 'net.java.dev.jna', name: 'jna', version: '4.4.0'
     // -----------------
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-gdx-desktop-ext/build.gradle b/exts/jphp-gdx-desktop-ext/build.gradle
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     provided project(':jphp-runtime')
-    compile project(':exts/jphp-gdx-ext')
+    compile project(':exts:jphp-gdx-ext')
 
     compile group: 'com.badlogicgames.gdx', name: 'gdx-platform', version: '1.9.8'
 

diff --git a/exts/jphp-json-ext/build.gradle b/exts/jphp-json-ext/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     compile 'com.google.code.gson:gson:2.7'
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-jsoup-ext/build.gradle b/exts/jphp-jsoup-ext/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     compile 'org.jsoup:jsoup:1.10.2'
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-markdown-ext/build.gradle b/exts/jphp-markdown-ext/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     // -----------------
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-mongo-ext/build.gradle b/exts/jphp-mongo-ext/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     // -----------------
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-mysql-ext/build.gradle b/exts/jphp-mysql-ext/build.gradle
@@ -1,13 +1,13 @@
 dependencies {
     provided project(":jphp-runtime")
-    compileMaven project(":exts/jphp-sql-ext")
+    compileMaven project(":exts:jphp-sql-ext")
 
     // dependencies ....
     compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.46'
     // -----------------
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-pgsql-ext/build.gradle b/exts/jphp-pgsql-ext/build.gradle
@@ -1,13 +1,13 @@
 dependencies {
     provided project(":jphp-runtime")
-    compileMaven project(":exts/jphp-sql-ext")
+    compileMaven project(":exts:jphp-sql-ext")
 
     // dependencies ....
     compile group: 'org.postgresql', name: 'postgresql', version: '42.2.2'
     // -----------------
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-semver-ext/build.gradle b/exts/jphp-semver-ext/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     compile 'com.vdurmont:semver4j:2.2.0'
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-sql-ext/build.gradle b/exts/jphp-sql-ext/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile 'org.xerial:sqlite-jdbc:3.8.7'
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-sqlite-ext/build.gradle b/exts/jphp-sqlite-ext/build.gradle
@@ -1,13 +1,13 @@
 dependencies {
     provided project(":jphp-runtime")
-    compileMaven project(":exts/jphp-sql-ext")
+    compileMaven project(":exts:jphp-sql-ext")
 
     // dependencies ....
     compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.21.0.1'
     // -----------------
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-ssh-ext/build.gradle b/exts/jphp-ssh-ext/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     compile group: 'com.jcraft', name: 'jsch', version: '0.1.54'
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-text-ext/build.gradle b/exts/jphp-text-ext/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     // -----------------
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-yaml-ext/build.gradle b/exts/jphp-yaml-ext/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     compile group: 'org.yaml', name: 'snakeyaml', version: '1.21'
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-zend-ext')
+    testCompile project(':exts:jphp-zend-ext')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/exts/jphp-zend-ext/build.gradle b/exts/jphp-zend-ext/build.gradle
@@ -5,14 +5,14 @@ sourceSets {
 dependencies {
     provided project(':jphp-core')
     provided project(':jphp-runtime')
-    jppmCompile (project(':exts/jphp-json-ext')) {
+    jppmCompile (project(':exts:jphp-json-ext')) {
         exclude group: 'com.google.code.gson', module: 'gson'
     }
 
     provided "com.google.code.gson:gson:2.7"
 
     testCompile 'junit:junit:4.+'
-    testCompile project(':exts/jphp-json-ext')
+    testCompile project(':exts:jphp-json-ext')
     testCompile project(':jphp-core')
     testCompile project(':jphp-core').sourceSets.test.output
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jphp-core/build.gradle b/jphp-core/build.gradle
@@ -13,6 +13,6 @@ dependencies {
 
     testCompile 'junit:junit:4.+'
     testCompile project(':jphp-runtime')
-    testCompile project(':exts/jphp-zend-ext')
-    testCompile project(':exts/jphp-json-ext')
+    testCompile project(':exts:jphp-zend-ext')
+    testCompile project(':exts:jphp-json-ext')
 }
diff --git a/jphp-scripting/build.gradle b/jphp-scripting/build.gradle
@@ -15,7 +15,7 @@ sourceSets {
 dependencies {
     compile project(':jphp-core')
     compile project(':jphp-runtime')
-    compile project(':exts/jphp-zend-ext')
+    compile project(':exts:jphp-zend-ext')
 
     testCompile 'junit:junit:4.+'
     testCompile project(':jphp-core').sourceSets.test.output

diff --git a/packager/build.gradle b/packager/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'maven'
 
 def jppmVersion = version.toString()
-def jppmRepoAddress = 'https://github.com/jphp-compiler/jphp'
+def jppmRepoAddress = 'https://github.com/jphp-group/jphp'
 
 file("$projectDir.path/package.php.yml").readLines().each { line ->
     if (line.startsWith("version:")) {
@@ -19,16 +19,16 @@ sourceSets {
 dependencies {
     compile project(':jphp-core')
     compile project(':jphp-runtime')
-    compile project(':exts/jphp-zend-ext')
-    compile project(':exts/jphp-yaml-ext')
-    compile project(':exts/jphp-compress-ext')
-    compile project(':exts/jphp-json-ext')
-    compile project(':exts/jphp-jsoup-ext')
-    compile project(':exts/jphp-semver-ext')
-    compile project(':exts/jphp-text-ext')
-    compile project(':exts/jphp-httpclient-ext')
-    compile project(':exts/jphp-git-ext')
-    compile project(':exts/jphp-parser-ext')
+    compile project(':exts:jphp-zend-ext')
+    compile project(':exts:jphp-yaml-ext')
+    compile project(':exts:jphp-compress-ext')
+    compile project(':exts:jphp-json-ext')
+    compile project(':exts:jphp-jsoup-ext')
+    compile project(':exts:jphp-semver-ext')
+    compile project(':exts:jphp-text-ext')
+    compile project(':exts:jphp-httpclient-ext')
+    compile project(':exts:jphp-git-ext')
+    compile project(':exts:jphp-parser-ext')
 }
 
 shadowJar {

diff --git a/packager/buildSrc/gradle/wrapper/gradle-wrapper.properties b/packager/buildSrc/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
diff --git a/packager/package.php.yml b/packager/package.php.yml
@@ -1,5 +1,5 @@
 name: jppm
-version: 0.4.0
+version: 0.4.1
 
 plugins: [GitHub, Hub, Doc]
 
@@ -14,7 +14,7 @@ github:
     > JPHP Package Manager v%version%
 
     **What's new**
-    + Upgradle gradle to 4.10.2 (java 11 support)
+    + Upgradle gradle to 5.1.1 (java 11 support)
 
     **Downloads**
     + For Windows: [JPPM Windows Installer](%github.address%/releases/download/jppm-%version%/jppm-setup-%version%.exe)

diff --git a/packager/src-php/packager/Packager.php b/packager/src-php/packager/Packager.php
@@ -147,7 +147,7 @@ public function install(Package $source, Vendor $vendor, bool $forceUpdate = fal
             foreach ($one->getInvalidDeps() as $name => list($version, $comment, $fail)) {
                 $method = $fail ? 'warn' : 'error';
 
-                if (is_array($comment)) {
+                if (!is_array($comment)) {
                     Console::{$method}("-> failed to install {0}@{1}, {2}.", $name, $version, $comment);
                 } else {
                     Console::{$method}("-> failed to install {0}@{1}: ", $name, $version);

diff --git a/sandbox/build.gradle b/sandbox/build.gradle
@@ -9,9 +9,9 @@ sourceSets {
 dependencies {
     compile project(':jphp-core')
     compile project(':jphp-runtime')
-    compile project(':exts/jphp-zend-ext')
-    compile project(':exts/jphp-json-ext')
-    compile project(':exts/jphp-semver-ext')
+    compile project(':exts:jphp-zend-ext')
+    compile project(':exts:jphp-json-ext')
+    compile project(':exts:jphp-semver-ext')
     //compile project(':jphp-json-ext')
     //compile project(':jphp-jsoup-ext')
     //compile project(':jphp-gdx-ext')

diff --git a/settings.gradle b/settings.gradle
@@ -13,12 +13,6 @@ include 'jphp-runtime',
 
 file("$rootDir.path/exts").listFiles().each { file ->
     if (file.directory && file.name.startsWith("jphp-") && file.name.endsWith("-ext")) {
-        include "exts/$file.name"
+        include "exts:$file.name"
     }
 }
-
-file("$rootDir.path/packager-exts").listFiles().each { file ->
-    if (file.directory && file.name.startsWith("jppm-") && file.name.endsWith("-ext")) {
-        include "packager-exts/$file.name"
-    }
-}