Merge pull request #316 from bzzzzzz/master

zvezdan · web-flow · commit 58305e694d38 · 2019-11-11T19:17:07.000-08:00
Update pygradle to gradle 5
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,6 +5,7 @@ jobs:
             - image: openjdk:8-jdk
         environment:
             _JAVA_OPTIONS: "-Xmx1024m -Xms256m"
+            GRADLE_OPTS: -Dorg.gradle.jvmargs=-Xmx1024m -Dorg.gradle.daemon=false
         steps:
             - run:
                 name: Prepare System
@@ -27,7 +28,7 @@ jobs:
                     - ~/.gradle
             - run:
                 name: Run Build
-                command: ./gradlew build --console plain --max-workers=2
+                command: ./gradlew build --console plain --max-workers=2 -Dorg.gradle.daemon=false
 
             - run:
                 name: Save test results
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ We support PyGradle on the following software versions.
 | Software | Version |
 |----------|---------|
 | Java     | 8.0     |
-| Gradle   | 4.0     |
+| Gradle   | 5.0     |
 
 We're happy to review and merge pull requests that add additional support to
 future versions of software.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
diff --git a/pivy-importer/build.gradle b/pivy-importer/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'application'
     id "com.github.jk1.dependency-license-report" version "0.3.4"
     id "com.github.hierynomus.license" version "0.13.1"
-    id "com.github.johnrengelman.shadow" version "2.0.2"
+    id "com.github.johnrengelman.shadow" version "5.1.0"
 }
 
 apply from: "$rootDir/gradle/code-quality.gradle"
diff --git a/pivy-importer/src/main/groovy/com/linkedin/python/importer/util/ProxyDetector.groovy b/pivy-importer/src/main/groovy/com/linkedin/python/importer/util/ProxyDetector.groovy
@@ -21,11 +21,11 @@ import org.apache.http.HttpHost
 @Slf4j
 class ProxyDetector {
 
-    private final static String HTTP_PROXY_HOST="http.proxyHost"
-    private final static String HTTP_PROXY_PORT="http.proxyPort"
+    private final static String HTTP_PROXY_HOST = "http.proxyHost"
+    private final static String HTTP_PROXY_PORT = "http.proxyPort"
 
     static maybeGetHttpProxy() {
-        int proxyPort=-1
+        int proxyPort = -1
 
         def proxyPortString = System.getProperty(HTTP_PROXY_PORT)
         def proxyHost = System.getProperty(HTTP_PROXY_HOST)
diff --git a/pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/plugin/WheelFirstPlugin.java b/pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/plugin/WheelFirstPlugin.java
@@ -50,7 +50,7 @@ public void apply(Project project) {
         project.getPlugins().withType(PythonPlugin.class, plugin -> {
 
             EditablePythonAbiContainer supportedWheelFormats = ExtensionUtils.getEditablePythonAbiContainer(project);
-            FileBackedWheelCache wheelCache = new FileBackedWheelCache(cacheDir, supportedWheelFormats);
+            FileBackedWheelCache wheelCache = new FileBackedWheelCache(cacheDir, supportedWheelFormats.copy());
 
             tasks.withType(ProvidesVenv.class, it -> it.setEditablePythonAbiContainer(supportedWheelFormats));
 
diff --git a/pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/tasks/ParallelWheelGenerationTask.java b/pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/tasks/ParallelWheelGenerationTask.java
@@ -62,7 +62,6 @@ public class ParallelWheelGenerationTask extends DefaultTask implements Supports
 
     private static final Logger logger = Logging.getLogger(ParallelWheelGenerationTask.class);
 
-    @Input
     private WheelCache wheelCache;
 
     private Set<String> currentPackages = Collections.newSetFromMap(new ConcurrentHashMap<>());
@@ -249,6 +248,7 @@ public void setFilesToConvert(FileCollection filesToConvert) {
         this.filesToConvert = filesToConvert;
     }
 
+    @Input
     public WheelCache getWheelCache() {
         return wheelCache;
     }
diff --git a/pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/tasks/PyTestTask.groovy b/pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/tasks/PyTestTask.groovy
@@ -16,7 +16,7 @@
 package com.linkedin.gradle.python.tasks
 
 import groovy.transform.CompileStatic
-import org.gradle.api.internal.tasks.options.Option
+import org.gradle.api.tasks.options.Option
 import org.gradle.process.ExecResult
 
 /**
diff --git a/pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/wheel/PythonAbiContainer.java b/pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/wheel/PythonAbiContainer.java
@@ -36,4 +36,9 @@ public interface PythonAbiContainer extends Serializable {
      * @return true is the python exec is compatible
      */
     boolean matchesSupportedVersion(File pythonExecutable, String pythonTag, String abiTag, String platformTag);
+
+    /**
+     * Create and return a new object with the same containers
+     */
+    PythonAbiContainer copy();
 }
diff --git a/pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/wheel/internal/DefaultPythonAbiContainer.java b/pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/wheel/internal/DefaultPythonAbiContainer.java
@@ -50,6 +50,13 @@ public boolean matchesSupportedVersion(File pythonExecutable, String pythonTag,
             .anyMatch(it -> contains(it, pythonTags, abiTags, platformTags));
     }
 
+    @Override
+    public EditablePythonAbiContainer copy() {
+        DefaultPythonAbiContainer container = new DefaultPythonAbiContainer();
+        container.supportedAbis = new ArrayList<>(supportedAbis);
+        return container;
+    }
+
     private static boolean contains(AbiDetails triple, String[] pythonTags, String[] abiTags, String[] platformTags) {
         return contains(triple.getPythonTag(), pythonTags)
             && contains(triple.getAbiTag(), abiTags)
diff --git a/pygradle-plugin/src/test/groovy/com/linkedin/gradle/python/util/DependencyOrderTest.groovy b/pygradle-plugin/src/test/groovy/com/linkedin/gradle/python/util/DependencyOrderTest.groovy
@@ -125,7 +125,7 @@ class DependencyOrderTest extends Specification {
         configuration = Stub(Configuration) {
             getIncoming() >> Stub(ResolvableDependencies) {
                 getResolutionResult() >> Stub(ResolutionResult) {
-                    getRoot() >> root
+                    it.getRoot() >> root
                 }
             }
             getResolvedConfiguration() >> Stub(ResolvedConfiguration) {
@@ -155,7 +155,7 @@ class DependencyOrderTest extends Specification {
 
     def "postOrderDependencies handles circular dependencies well"() {
         setup: "make the root with circular dependencies"
-        def dependencies = new LinkedHashSet<ResolvedComponentResult>()
+        def deps = new LinkedHashSet<ResolvedComponentResult>()
         def seen = new HashSet<ComponentIdentifier>()
 
         // add the 4th branch for circular dependency test
@@ -167,11 +167,11 @@ class DependencyOrderTest extends Specification {
         }
 
         when: "called with circular dependencies in the tree"
-        DependencyOrder.postOrderDependencies(root, seen, dependencies)
+        DependencyOrder.postOrderDependencies(root, seen, deps)
 
         then: "returns dependencies in post-order cutting the recursion at the circular dependency"
         // comparing string representations because sets would match even with a wrong order
-        dependencies.toString() == expectedDependencies.toString()
+        deps.toString() == expectedDependencies.toString()
 
         cleanup:
         expectedDependencies.removeAll(expectedCircularBranch)
diff --git a/version.properties b/version.properties
@@ -1 +1 @@
-version=0.11.1
+version=0.12.0

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`	`id 'application'`
`5`	`5`	`id "com.github.jk1.dependency-license-report" version "0.3.4"`
`6`	`6`	`id "com.github.hierynomus.license" version "0.13.1"`
`7`		`- id "com.github.johnrengelman.shadow" version "2.0.2"`
	`7`	`+ id "com.github.johnrengelman.shadow" version "5.1.0"`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`apply from: "$rootDir/gradle/code-quality.gradle"`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ public class ParallelWheelGenerationTask extends DefaultTask implements Supports`
`62`	`62`
`63`	`63`	`private static final Logger logger = Logging.getLogger(ParallelWheelGenerationTask.class);`
`64`	`64`
`65`		`- @Input`
`66`	`65`	`private WheelCache wheelCache;`
`67`	`66`
`68`	`67`	`private Set<String> currentPackages = Collections.newSetFromMap(new ConcurrentHashMap<>());`
`@@ -249,6 +248,7 @@ public void setFilesToConvert(FileCollection filesToConvert) {`
`249`	`248`	`this.filesToConvert = filesToConvert;`
`250`	`249`	`}`
`251`	`250`
	`251`	`+ @Input`
`252`	`252`	`public WheelCache getWheelCache() {`
`253`	`253`	`return wheelCache;`
`254`	`254`	`}`