Updated Gradle and some dependencies including Kotlin (#1343)

* Updated Gradle (through new wrapper task) and some dependencies including Kotlin. Tweaked some gradle files to change where kapt plugin is applied to make it possible to use them with latest stable Kotlin version.

* Reverted Gradle to 5.0 since further updates are blocked by kotlin-metadata's compiler using a conflicting version of Kotlin

* Fixed unscoped calls to async coroutine builder

* Updated some additional dependencies

* Updated Gradle Versions Plugin which no longer reports by default if a custom outputFormatter is used so it needed additional setup to print the report. This may be improved later by hooking to the resolution strategy instead of the outputFormatter for what we are doing.

* Used separate kotlin version definition for ank since it is not working properly with None / Some with latest Kotlin 1.3.21 but works on 1.3.11.

Author: jrgonzalezg

build.gradle

@@ -14,24 +14,27 @@
  * limitations under the License.
  */
 
+import com.github.benmanes.gradle.versions.reporter.PlainTextReporter
+
 buildscript {
     ext {
         // Constants
-        gradleVersion = '4.10'
-        gradleVersionsPluginVersion = '0.20.0'
-        javaVersion = JavaVersion.VERSION_1_7
+        ankKotlinVersion = '1.3.11'
+        daggerVersion = '2.21'
+        detekt_version = '1.0.0-RC12'
+        dokka_version = '0.9.17'
+        gradleVersionsPluginVersion = '0.21.0'
         jUnitVersion = '4.12'
-        jUnitVintageVersion = '5.2.0'
+        jUnitVintageVersion = '5.4.0'
+        javaVersion = JavaVersion.VERSION_1_7
+        kotlinPoetVersion = '1.1.0'
         kotlinTestVersion = '3.3.1'
-        kotlinVersion = '1.3.11'
-        daggerVersion = '2.17'
-        kotlinxCoroutinesVersion = '1.1.0'
+        kotlinVersion = '1.3.21'
         kotlinxCollectionsImmutableVersion = '0.1'
-        kotlinPoetVersion = '1.1.0'
-        projectReactorVersion = '3.1.8.RELEASE'
-        rxJavaVersion = '2.2.1'
-        dokka_version = '0.9.17'
-        detekt_version = '1.0.0-RC12'
+        kotlinxCoroutinesVersion = '1.1.1'
+        projectReactorVersion = '3.2.6.RELEASE'
+        retrofitVersion = '2.5.0'
+        rxJavaVersion = '2.2.7'
     }
 
     repositories {
@@ -49,7 +52,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'io.arrow-kt:ank-gradle-plugin:0.7.1'
-        classpath 'org.ajoberstar:gradle-git-publish:1.0.1'
+        classpath 'org.ajoberstar:gradle-git-publish:2.0.0'
         classpath "net.rdrei.android.buildtimetracker:gradle-plugin:0.11.1"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detekt_version"
@@ -212,6 +215,11 @@ tasks.create('repl') {
     }
 }
 
+tasks.wrapper {
+    gradleVersion = "5.0"
+    distributionType = Wrapper.DistributionType.ALL
+}
+
 apply plugin: 'com.github.ben-manes.versions'
 
 configurations.all {
@@ -235,6 +243,9 @@ dependencyUpdates {
             .plus(result.unresolved.dependencies)
             .findAll { dependency -> dependenciesToCheck.any { it == "${dependency.group}:${dependency.name}" } }
 
+        def plainTextReporter = new PlainTextReporter(project, revision, gradleReleaseChannel)
+        plainTextReporter.write(System.out, result)
+
         final isRejected = dependencies
                 .any { dependency -> disallowedQualifiers.any(isDisallowed(dependency)) }
 

gradle/wrapper/gradle-wrapper.jar

@@ -7,7 +7,7 @@ sourceSets {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$parent.ext.kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$ankKotlinVersion"
     testImplementation 'junit:junit:4.12'
 }
 
@@ -20,4 +20,4 @@ gradlePlugin {
     }
 }
 
-apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
+apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

gradlew

@@ -1,14 +1,14 @@
 apply plugin: 'kotlin'
+apply plugin: 'kotlin-kapt'
 
 dependencies {
     compile project(":arrow-core-extensions")
     compile project(":arrow-extras-extensions")
     compile project(":arrow-effects-io-extensions")
 
-    compile "org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion"
-    compile "org.jetbrains.kotlin:kotlin-script-util:$kotlinVersion"
+    compile "org.jetbrains.kotlin:kotlin-compiler:$ankKotlinVersion"
+    compile "org.jetbrains.kotlin:kotlin-script-util:$ankKotlinVersion"
     kapt project(':arrow-meta')
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'

gradlew.bat

@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-annotations')
@@ -13,4 +15,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'

modules/ank/arrow-ank-gradle/build.gradle

@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-annotations')
@@ -13,4 +15,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'

modules/ank/arrow-ank/build.gradle

@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-annotations')
@@ -13,4 +15,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'

modules/aql/arrow-query-language/build.gradle

@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-annotations')
@@ -16,4 +18,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'