Merge pull request #68 from koral--/deps-bump

Update dependency versions:

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'com.bmuschko.nexus' version '2.3.1'
-    id 'com.github.ben-manes.versions' version '0.25.0'
+    id 'com.github.ben-manes.versions' version '0.29.0'
     id 'groovy'
     id 'maven-publish'
     id 'codenarc'
@@ -38,7 +38,7 @@ dependencies {
     testImplementation('org.spockframework:spock-junit4:2.0-M3-groovy-2.5') {
         exclude group: 'org.codehaus.groovy'
     }
-    testImplementation 'net.bytebuddy:byte-buddy:1.10.13' //for Spying in Spock
+    testImplementation 'net.bytebuddy:byte-buddy:1.10.14' //for Spying in Spock
 
     funcTestImplementation sourceSets.main.output
     //to make production plugin classes visible in functional tests (it's not in testImplementation configuration)

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/funcTest/groovy/pl/droidsonroids/gradle/pitest/functional/AbstractPitestFunctionalSpec.groovy

@@ -27,10 +27,10 @@ abstract class AbstractPitestFunctionalSpec extends IntegrationSpec {
                 apply plugin: 'com.android.library'
 
                 android {
-                    compileSdkVersion 29
+                    compileSdkVersion 30
                     defaultConfig {
                         minSdkVersion 10
-                        targetSdkVersion 29
+                        targetSdkVersion 30
                     }
                 }
                 group = 'gradle.pitest.test'

src/funcTest/groovy/pl/droidsonroids/gradle/pitest/functional/KotlinPitestPluginFunctionalSpec.groovy

@@ -27,10 +27,10 @@ class KotlinPitestPluginFunctionalSpec extends AbstractPitestFunctionalSpec {
                 }
 
                 android {
-                    compileSdkVersion 29
+                    compileSdkVersion 30
                     defaultConfig {
                         minSdkVersion 10
-                        targetSdkVersion 29
+                        targetSdkVersion 30
                     }
                     lintOptions {
                         //ignore missing lint database

src/funcTest/groovy/pl/droidsonroids/gradle/pitest/functional/MockableAndroidJarFunctionalSpec.groovy

@@ -24,10 +24,10 @@ class MockableAndroidJarFunctionalSpec extends AbstractPitestFunctionalSpec {
                 apply plugin: 'com.android.application'
 
                 android {
-                    compileSdkVersion 29
+                    compileSdkVersion 30
                     defaultConfig {
                         minSdkVersion 10
-                        targetSdkVersion 29
+                        targetSdkVersion 30
                     }
                     testOptions {
                         unitTests.returnDefaultValues = true

src/funcTest/groovy/pl/droidsonroids/gradle/pitest/functional/OverridePluginFunctionalSpec.groovy

@@ -19,10 +19,10 @@ class OverridePluginFunctionalSpec extends AbstractPitestFunctionalSpec {
                 apply plugin: 'pl.droidsonroids.pitest'
 
                 android {
-                    compileSdkVersion 29
+                    compileSdkVersion 30
                     defaultConfig {
                         minSdkVersion 10
-                        targetSdkVersion 29
+                        targetSdkVersion 30
                     }
                 }
                 group = 'gradle.pitest.test'

src/funcTest/groovy/pl/droidsonroids/gradle/pitest/functional/PitestPluginGeneralFunctionalSpec.groovy

@@ -121,10 +121,10 @@ class PitestPluginGeneralFunctionalSpec extends AbstractPitestFunctionalSpec {
                 apply plugin: 'pl.droidsonroids.pitest'
 
                 android {
-                    compileSdkVersion 29
+                    compileSdkVersion 30
                     defaultConfig {
                         minSdkVersion 10
-                        targetSdkVersion 29
+                        targetSdkVersion 30
                     }
                 }
                 group = 'gradle.pitest.test'

src/funcTest/groovy/pl/droidsonroids/gradle/pitest/functional/TargetClassesFunctionalSpec.groovy

@@ -17,10 +17,10 @@ class TargetClassesFunctionalSpec extends AbstractPitestFunctionalSpec {
                 }
 
                 android {
-                    compileSdkVersion 29
+                    compileSdkVersion 30
                     defaultConfig {
                         minSdkVersion 10
-                        targetSdkVersion 29
+                        targetSdkVersion 30
                     }
                 }
             """.stripIndent()

src/funcTest/resources/testProjects/junit5kotlin/build.gradle

@@ -47,10 +47,10 @@ pitest {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
     lintOptions {
         //ignore missing lint database

src/funcTest/resources/testProjects/mockk/build.gradle

@@ -37,10 +37,10 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
     lintOptions {
         //ignore missing lint database

src/funcTest/resources/testProjects/multiproject/build.gradle

@@ -28,10 +28,10 @@ configure(project(":shared")) {
     apply plugin: 'com.android.library'
 
     android {
-        compileSdkVersion 29
+        compileSdkVersion 30
         defaultConfig {
             minSdkVersion 10
-            targetSdkVersion 29
+            targetSdkVersion 30
         }
 
     }
@@ -46,10 +46,10 @@ configure(project(':itest')) {
     apply plugin: 'com.android.application'
 
     android {
-        compileSdkVersion 29
+        compileSdkVersion 30
         defaultConfig {
             minSdkVersion 10
-            targetSdkVersion 29
+            targetSdkVersion 30
         }
     }
     dependencies {

src/funcTest/resources/testProjects/simple1/build.gradle

@@ -2,10 +2,10 @@ apply plugin: 'pl.droidsonroids.pitest'
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 10
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
 }
 

src/funcTest/resources/testProjects/simpleKotlin/build.gradle

@@ -14,10 +14,10 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 10
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
     lintOptions {
         //ignore missing lint database

src/funcTest/resources/testProjects/simpleKotlinAndroidGradle2/build.gradle

@@ -13,10 +13,10 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 10
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
     lintOptions {
         //ignore missing lint database

src/test/groovy/pl/droidsonroids/gradle/pitest/AndroidUtils.groovy

@@ -27,10 +27,10 @@ class AndroidUtils {
         }
         project.apply(plugin: "com.android.library")
         project.android.with {
-            compileSdkVersion 29
+            compileSdkVersion 30
             defaultConfig {
                 minSdkVersion 10
-                targetSdkVersion 29
+                targetSdkVersion 30
             }
         }
         project.apply(plugin: "pl.droidsonroids.pitest")
@@ -54,10 +54,10 @@ class AndroidUtils {
         }
         project.apply(plugin: "com.android.application")
         project.android.with {
-            compileSdkVersion 29
+            compileSdkVersion 30
             defaultConfig {
                 minSdkVersion 10
-                targetSdkVersion 29
+                targetSdkVersion 30
             }
             buildTypes {
                 release { }