Merge pull request #54 from koral--/upstream

Merge upstream changes fixes #53
koral-- · Sep 30, 2019 · 75de1b3 · 75de1b3
2 parents 3c0d6eb + 8c841db
commit 75de1b3
Show file tree

Hide file tree

Showing 20 changed files with 1,003 additions and 382 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,34 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/openjdk:8-jdk-browsers
+    steps:
+      - checkout
+      - restore_cache:
+          # Read about caching dependencies: https://circleci.com/docs/2.0/caching/
+          key: gradle-pitest-plugin-2-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum "gradle/cdeliveryboy-release.gradle" }}
+
+      - run: ./gradlew clean check
+      - run: ./gradlew funTest
+      # To leave clear state in cached ~/.gradle - doesn't work as expected anyway...
+      - run: ./gradlew --stop
+
+      - save_cache:
+          # TODO: Add some excludes?
+          paths:
+            - ~/.gradle
+          key: gradle-pitest-plugin-2-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum "gradle/cdeliveryboy-release.gradle" }}
+
+      # Upload test results for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/
+      - store_test_results:
+          path: build/test-results
+
+      # Upload test summary for display in Artifacts: https://circleci.com/docs/2.0/artifacts/
+      - store_artifacts:
+          path: build/reports/tests/test
+          destination: test
+      - store_artifacts:
+          path: build/reports/tests/funcTest
+          destination: funcTest
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 0.2.2 - 2019-09-30
+- Merge upstream changes 42c9e3211da4b160695ee4004722a68a59243088 [#53](https://github.com/koral--/gradle-pitest-plugin/issue/53)
+
 # 0.2.1 - 2019-05-04
 - Add `excludeMockableAndroidJar` extension property
 -- Fix compatibility with Robolectric [#44](https://github.com/koral--/gradle-pitest-plugin/issue/44)

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ which supports Android gradle projects.
 
 ```groovy
 plugins {
-  id "pl.droidsonroids.pitest" version "0.2.1"
+  id 'pl.droidsonroids.pitest' version '0.2.2'
 }
 ```
 
@@ -24,7 +24,7 @@ buildscript {
     // An alternative URL is 'https://dl.google.com/dl/android/maven2/'    
   }
   dependencies {
-    classpath 'pl.droidsonroids.gradle:gradle-pitest-plugin:0.2.1'
+    classpath 'pl.droidsonroids.gradle:gradle-pitest-plugin:0.2.2'
   }
 }
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,6 +5,7 @@ build:
 
 before_build:
   - SET PATH=%JAVA_HOME%\bin;%PATH%
+  - SET GRADLE_OPTS=-Xmx1024m
   - java -version -Xmx32m
 
 build_script:

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'com.bmuschko.nexus' version '2.3.1'
-    id 'com.github.ben-manes.versions' version '0.20.0'
+    id 'com.github.ben-manes.versions' version '0.25.0'
     id 'groovy'
     id 'maven-publish'
     id 'signing'
@@ -13,8 +13,8 @@ sourceCompatibility = 1.8
 repositories {
     mavenCentral()
     mavenLocal()
-    jcenter()
     google()
+    jcenter()
 }
 
 sourceSets {
@@ -28,21 +28,21 @@ sourceSets {
 dependencies {
     implementation gradleApi()
     implementation localGroovy()
-    implementation 'com.android.tools.build:gradle:3.4.0'
+    implementation 'com.android.tools.build:gradle:3.5.0'
 
-    testImplementation('org.spockframework:spock-core:1.2-groovy-2.4') {
+    testImplementation('org.spockframework:spock-core:1.3-groovy-2.4') {
         //groovy 2.3.x is already provided by Gradle itself
         exclude group: 'org.codehaus.groovy', module: 'groovy-all'
     }
     testImplementation 'info.solidsoft.spock:spock-global-unroll:0.5.1'
-    testImplementation 'net.bytebuddy:byte-buddy:1.9.8' //for Spying in Spock
+    testImplementation 'net.bytebuddy:byte-buddy:1.10.1' //for Spying in Spock
     testImplementation 'junit:junit:4.12'
 
     funcTestImplementation sourceSets.main.output
     //to make production plugin classes visible in functional tests (it's not in testImplementation configuration)
     funcTestImplementation configurations.testImplementation
     funcTestRuntimeOnly configurations.testRuntimeOnly
-    funcTestImplementation('com.netflix.nebula:nebula-test:7.1.7') {
+    funcTestImplementation('com.netflix.nebula:nebula-test:7.2.5') {
         exclude group: 'org.codehaus.groovy', module: 'groovy-all'
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION=0.2.1
+VERSION=0.2.2
 GROUP=pl.droidsonroids.gradle
 POM_DESCRIPTION=Gradle plugin for PIT Mutation Testing in Android projects
 POM_URL=https://github.com/koral--/gradle-pitest-plugin