Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Kotlin to 1.2.41 #820

Merged
merged 10 commits into from
Apr 29, 2018
Merged

Update Kotlin to 1.2.41 #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
54f2ad6
Update Kotlin to 1.2.40
andrzejressel Apr 27, 2018
b26d130
Badge
andrzejressel Apr 27, 2018
2d1ff6b
Update ProcessorUtils.kt
andrzejressel Apr 27, 2018
bac5ec5
Update ProcessorUtils.kt
andrzejressel Apr 27, 2018
31a8bb4
Merge remote-tracking branch 'upstream/master' into feature/kotlin_1_…
andrzejressel Apr 28, 2018
8fcb082
Merge branch 'feature/kotlin_1_2_40' of github.com:jereksel/arrow int…
andrzejressel Apr 28, 2018
14b8119
Merge branch 'master' into feature/kotlin_1_2_40
andrzejressel Apr 28, 2018
738c724
1.2.41
andrzejressel Apr 28, 2018
1d07cd1
1.2.41
andrzejressel Apr 28, 2018
c53c15d
Revert
andrzejressel Apr 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![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)
[![Build Status](https://travis-ci.org/arrow-kt/arrow.svg?branch=master)](https://travis-ci.org/arrow-kt/arrow/)
[![Kotlin version badge](https://img.shields.io/badge/kotlin-1.2.31-blue.svg)](http://kotlinlang.org/)
[![Kotlin version badge](https://img.shields.io/badge/kotlin-1.2.41-blue.svg)](http://kotlinlang.org/)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
[![codecov](https://codecov.io/gh/arrow-kt/arrow/branch/master/graph/badge.svg)](https://codecov.io/gh/arrow-kt/arrow)

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {
gradleVersionsPluginVersion = '0.17.0'
javaVersion = JavaVersion.VERSION_1_7
kotlinTestVersion = '2.0.7'
kotlinVersion = '1.2.31'
daggerVersion = '2.5'
kotlinVersion = '1.2.41'
daggerVersion = '2.15'
kotlinxCoroutinesVersion = '0.22.5'
kotlinxCollectionsImmutableVersion = '0.1'
}
Expand Down
5 changes: 4 additions & 1 deletion modules/core/arrow-annotations-processor/src/main/java/arrow/optics/OpticsProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import com.google.auto.service.AutoService
import me.eugeniomarletti.kotlin.metadata.KotlinClassMetadata
import me.eugeniomarletti.kotlin.metadata.isDataClass
import me.eugeniomarletti.kotlin.metadata.kotlinMetadata
import me.eugeniomarletti.kotlin.metadata.shadow.utils.addIfNotNull
import java.io.File
import javax.annotation.processing.Processor
import javax.annotation.processing.RoundEnvironment
Expand Down Expand Up @@ -135,4 +134,8 @@ class OpticsProcessor : AbstractProcessor() {
(kotlinMetadata as? KotlinClassMetadata)?.data?.classProto?.isSealed == true -> SEALED_CLASS
else -> OTHER
}

private fun <T> MutableCollection<T>.addIfNotNull(t: T?) {
if (t != null) add(t)
}
}
2 changes: 1 addition & 1 deletion modules/docs/arrow-docs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies {
compile "io.kotlintest:kotlintest:$kotlinTestVersion"

compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion"
compile "io.reactivex.rxjava2:rxjava:2.1.4"
compile "io.reactivex.rxjava2:rxjava:2.1.13"
}

task printcp {
Expand Down
2 changes: 1 addition & 1 deletion modules/effects/arrow-effects-rx2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
testCompile "io.kotlintest:kotlintest:$kotlinTestVersion"
testCompile project(':arrow-test')

compile "io.reactivex.rxjava2:rxjava:2.1.4"
compile "io.reactivex.rxjava2:rxjava:2.1.13"
}

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