Skip to content

Commit 733fc44

Browse files
andrzejresselpakoito
authored andcommitted
Update Kotlin to 1.2.41 (arrow-kt#820)
* Update Kotlin to 1.2.40 * Badge * Update ProcessorUtils.kt * Update ProcessorUtils.kt * 1.2.41 * 1.2.41 * Revert
1 parent b390bf7 commit 733fc44

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.arrow-kt/arrow-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.arrow-kt/arrow-core)
44
[![Build Status](https://travis-ci.org/arrow-kt/arrow.svg?branch=master)](https://travis-ci.org/arrow-kt/arrow/)
5-
[![Kotlin version badge](https://img.shields.io/badge/kotlin-1.2.31-blue.svg)](http://kotlinlang.org/)
5+
[![Kotlin version badge](https://img.shields.io/badge/kotlin-1.2.41-blue.svg)](http://kotlinlang.org/)
66
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
77
[![codecov](https://codecov.io/gh/arrow-kt/arrow/branch/master/graph/badge.svg)](https://codecov.io/gh/arrow-kt/arrow)
88

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ buildscript {
2121
gradleVersionsPluginVersion = '0.17.0'
2222
javaVersion = JavaVersion.VERSION_1_7
2323
kotlinTestVersion = '2.0.7'
24-
kotlinVersion = '1.2.31'
25-
daggerVersion = '2.5'
24+
kotlinVersion = '1.2.41'
25+
daggerVersion = '2.15'
2626
kotlinxCoroutinesVersion = '0.22.5'
2727
kotlinxCollectionsImmutableVersion = '0.1'
2828
}

modules/core/arrow-annotations-processor/src/main/java/arrow/optics/OpticsProcessor.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import com.google.auto.service.AutoService
99
import me.eugeniomarletti.kotlin.metadata.KotlinClassMetadata
1010
import me.eugeniomarletti.kotlin.metadata.isDataClass
1111
import me.eugeniomarletti.kotlin.metadata.kotlinMetadata
12-
import me.eugeniomarletti.kotlin.metadata.shadow.utils.addIfNotNull
1312
import java.io.File
1413
import javax.annotation.processing.Processor
1514
import javax.annotation.processing.RoundEnvironment
@@ -135,4 +134,8 @@ class OpticsProcessor : AbstractProcessor() {
135134
(kotlinMetadata as? KotlinClassMetadata)?.data?.classProto?.isSealed == true -> SEALED_CLASS
136135
else -> OTHER
137136
}
137+
138+
private fun <T> MutableCollection<T>.addIfNotNull(t: T?) {
139+
if (t != null) add(t)
140+
}
138141
}

modules/docs/arrow-docs/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
compile "io.kotlintest:kotlintest:$kotlinTestVersion"
2727

2828
compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion"
29-
compile "io.reactivex.rxjava2:rxjava:2.1.4"
29+
compile "io.reactivex.rxjava2:rxjava:2.1.13"
3030
}
3131

3232
task printcp {

modules/effects/arrow-effects-rx2/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
testCompile "io.kotlintest:kotlintest:$kotlinTestVersion"
1111
testCompile project(':arrow-test')
1212

13-
compile "io.reactivex.rxjava2:rxjava:2.1.4"
13+
compile "io.reactivex.rxjava2:rxjava:2.1.13"
1414
}
1515

1616
apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

0 commit comments

Comments
 (0)