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

jrgonzalezg · jrgonzalezg · commit 6e0d975c7fe4 · 2019-03-09T13:52:57.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -17,21 +17,21 @@
 buildscript {
     ext {
         // Constants
-        gradleVersion = '4.10'
+        daggerVersion = '2.21'
+        detekt_version = '1.0.0-RC12'
+        dokka_version = '0.9.17'
         gradleVersionsPluginVersion = '0.20.0'
-        javaVersion = JavaVersion.VERSION_1_7
         jUnitVersion = '4.12'
-        jUnitVintageVersion = '5.2.0'
+        jUnitVintageVersion = '5.4.0'
+        javaVersion = JavaVersion.VERSION_1_7
+        kotlinPoetVersion = '1.0.0-RC1'
         kotlinTestVersion = '3.1.5'
-        kotlinVersion = '1.3.11'
-        daggerVersion = '2.17'
-        kotlinxCoroutinesVersion = '1.1.0'
+        kotlinVersion = '1.3.21'
         kotlinxCollectionsImmutableVersion = '0.1'
-        kotlinPoetVersion = '1.0.0-RC1'
-        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 {
@@ -212,6 +212,11 @@ tasks.create('repl') {
     }
 }
 
+tasks.wrapper {
+    gradleVersion = "5.2.1"
+    distributionType = Wrapper.DistributionType.ALL
+}
+
 apply plugin: 'com.github.ben-manes.versions'
 
 configurations.all {
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
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/modules/ank/arrow-ank/build.gradle b/modules/ank/arrow-ank/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'kotlin'
+apply plugin: 'kotlin-kapt'
 
 dependencies {
     compile project(":arrow-core-extensions")
@@ -11,4 +12,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/aql/arrow-query-language/build.gradle b/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')
@@ -13,4 +15,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/core/arrow-core-data/build.gradle b/modules/core/arrow-core-data/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'
diff --git a/modules/core/arrow-core-extensions/build.gradle b/modules/core/arrow-core-extensions/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'
diff --git a/modules/core/arrow-extras-data/build.gradle b/modules/core/arrow-extras-data/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'
diff --git a/modules/core/arrow-extras-extensions/build.gradle b/modules/core/arrow-extras-extensions/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-annotations')
@@ -14,4 +16,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/core/arrow-generic/build.gradle b/modules/core/arrow-generic/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-annotations')
@@ -14,4 +16,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/core/arrow-kindedj/build.gradle b/modules/core/arrow-kindedj/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile project(':arrow-extras-data')
 
@@ -14,4 +16,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/core/arrow-mtl/build.gradle b/modules/core/arrow-mtl/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-annotations')
@@ -12,4 +14,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/core/arrow-syntax/build.gradle b/modules/core/arrow-syntax/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-annotations')
@@ -8,4 +10,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/core/arrow-test/build.gradle b/modules/core/arrow-test/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile project(':arrow-extras-data')
     compile project(':arrow-optics')
@@ -16,4 +18,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/core/arrow-typeclasses/build.gradle b/modules/core/arrow-typeclasses/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-annotations')
@@ -12,4 +14,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/dagger/arrow-dagger-effects-rx2/build.gradle b/modules/dagger/arrow-dagger-effects-rx2/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-dagger')
@@ -11,4 +13,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/dagger/arrow-dagger-effects/build.gradle b/modules/dagger/arrow-dagger-effects/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-dagger')
@@ -11,4 +13,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/dagger/arrow-dagger/build.gradle b/modules/dagger/arrow-dagger/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-extras-extensions')
@@ -11,4 +13,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/docs/arrow-docs/build.gradle b/modules/docs/arrow-docs/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'ank-gradle-plugin'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'org.ajoberstar.git-publish'
 
 dependencies {
@@ -69,5 +70,3 @@ targetCompatibility = javaVersion
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
 
 compileKotlin.kotlinOptions.freeCompilerArgs += ["-Xskip-runtime-version-check"]
-
-apply plugin: 'kotlin-kapt'
diff --git a/modules/docs/arrow-examples/build.gradle b/modules/docs/arrow-examples/build.gradle
@@ -1,3 +1,4 @@
+apply plugin: 'kotlin-kapt'
 apply plugin: 'idea'
 
 idea {
@@ -40,5 +41,3 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion"
 }
-
-apply plugin: 'kotlin-kapt'
diff --git a/modules/effects/arrow-effects-data/build.gradle b/modules/effects/arrow-effects-data/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile project(':arrow-extras-extensions')
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
@@ -12,4 +14,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/effects/arrow-effects-extensions/build.gradle b/modules/effects/arrow-effects-extensions/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile project(':arrow-effects-data')
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
@@ -13,4 +15,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/effects/arrow-effects-io-extensions/build.gradle b/modules/effects/arrow-effects-io-extensions/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile project(':arrow-effects-data')
     compile project(':arrow-effects-extensions')
@@ -14,4 +16,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/effects/arrow-effects-reactor-data/build.gradle b/modules/effects/arrow-effects-reactor-data/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile project(':arrow-effects-data')
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
@@ -16,4 +18,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/effects/arrow-effects-reactor-extensions/build.gradle b/modules/effects/arrow-effects-reactor-extensions/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile project(':arrow-effects-reactor-data')
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
@@ -15,4 +17,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/effects/arrow-effects-rx2-data/build.gradle b/modules/effects/arrow-effects-rx2-data/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile project(':arrow-effects-data')
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
@@ -15,4 +17,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/effects/arrow-effects-rx2-extensions/build.gradle b/modules/effects/arrow-effects-rx2-extensions/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile project(':arrow-effects-rx2-data')
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
@@ -14,4 +16,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/free/arrow-free-data/build.gradle b/modules/free/arrow-free-data/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'
diff --git a/modules/free/arrow-free-extensions/build.gradle b/modules/free/arrow-free-extensions/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'
diff --git a/modules/integrations/arrow-integrations-retrofit-adapter/build.gradle b/modules/integrations/arrow-integrations-retrofit-adapter/build.gradle
@@ -1,4 +1,4 @@
-def retrofitVersion = "2.4.0"
+apply plugin: 'kotlin-kapt'
 
 dependencies {
     compile project(':arrow-effects-data')
@@ -20,4 +20,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/optics/arrow-optics/build.gradle b/modules/optics/arrow-optics/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile project(':arrow-extras-data')
     compile project(':arrow-extras-extensions')
@@ -13,4 +15,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/recursion/arrow-recursion-data/build.gradle b/modules/recursion/arrow-recursion-data/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'kotlin-kapt'
+
 dependencies {
     compile project(':arrow-extras-extensions')
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
@@ -12,4 +14,3 @@ dependencies {
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
-apply plugin: 'kotlin-kapt'
diff --git a/modules/recursion/arrow-recursion-extensions/build.gradle b/modules/recursion/arrow-recursion-extensions/build.gradle
diff --git a/modules/reflect/arrow-reflect/build.gradle b/modules/reflect/arrow-reflect/build.gradle
diff --git a/modules/streams/arrow-streams/build.gradle b/modules/streams/arrow-streams/build.gradle
diff --git a/modules/validation/arrow-validation/build.gradle b/modules/validation/arrow-validation/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`apply plugin: 'kotlin'`
	`2`	`+apply plugin: 'kotlin-kapt'`
`2`	`3`
`3`	`4`	`dependencies {`
`4`	`5`	`compile project(":arrow-core-extensions")`
`@@ -11,4 +12,3 @@ dependencies {`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`apply from: rootProject.file('gradle/gradle-mvn-push.gradle')`
`14`		`-apply plugin: 'kotlin-kapt'`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+apply plugin: 'kotlin-kapt'`
	`2`	`+`
`1`	`3`	`dependencies {`
`2`	`4`	`compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"`
`3`	`5`	`compile project(':arrow-annotations')`
`@@ -13,4 +15,3 @@ dependencies {`
`13`	`15`	`}`
`14`	`16`
`15`	`17`	`apply from: rootProject.file('gradle/gradle-mvn-push.gradle')`
`16`		`-apply plugin: 'kotlin-kapt'`