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.

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

Update Kotlin to 1.2.41 #820

Merged
merged 10 commits into from
Apr 29, 2018
Merged

Update Kotlin to 1.2.41 #820

merged 10 commits into from
Apr 29, 2018

Conversation

andrzejressel
Copy link
Contributor

No description provided.

@codecov
Copy link

codecov bot commented Apr 27, 2018

Codecov Report

Merging #820 into master will decrease coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #820      +/-   ##
============================================
- Coverage     44.25%   44.23%   -0.02%     
- Complexity      625      627       +2     
============================================
  Files           290      290              
  Lines          7419     7420       +1     
  Branches        830      832       +2     
============================================
- Hits           3283     3282       -1     
  Misses         3837     3837              
- Partials        299      301       +2
Impacted Files Coverage Δ Complexity Δ
...ssor/src/main/java/arrow/optics/OpticsProcessor.kt 65.62% <100%> (+0.54%) 25 <2> (+2) ⬆️
...ics/src/main/kotlin/arrow/optics/instances/mapk.kt 87.5% <0%> (-4.17%) 0% <0%> (ø)
...src/main/java/arrow/common/utils/ProcessorUtils.kt 41.37% <0%> (-1.15%) 0% <0%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b390bf7...c53c15d. Read the comment docs.

…2_40

# Conflicts:
#	modules/core/arrow-annotations-processor/src/main/java/arrow/renzu/RenzuGenerator.kt
@pakoito
Copy link
Member

pakoito commented Apr 28, 2018

There seems to be a merge conflict, because you're also adding Eugenio's changes into this branch.

@raulraja
Copy link
Member

Can we bump this up to 1.2.41 per #807? /cc @jrgonzalezg

@Takhion
Copy link
Contributor

Takhion commented Apr 28, 2018

Oh no, I didn't see this before creating #821, sorry @jereksel! 😰🙇
Anyway, I suggest to rebase from master and discard any changes related to kotlin-metadata 👍

@andrzejressel andrzejressel changed the title Update Kotlin to 1.2.40 Update Kotlin to 1.2.41 Apr 28, 2018
Copy link
Member

@pakoito pakoito left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sneaky collections addition, although I'll take it :D

@pakoito pakoito merged commit 733fc44 into arrow-kt:master Apr 29, 2018
RawToast pushed a commit to RawToast/kategory that referenced this pull request Jul 18, 2018
* Update Kotlin to 1.2.40

* Badge

* Update ProcessorUtils.kt

* Update ProcessorUtils.kt

* 1.2.41

* 1.2.41

* Revert
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants