-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Updating to scala 2.13-M4 #2335
Merged
Merged
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
22ffaa0
wip - all dependencies updated. need a way to fix breaking API
kailuowang cae9e4b
wip kernel working, core compiles, doctests failing due to different …
kailuowang c969fa9
disable doctests on 2.13 for now
kailuowang 5d04893
wip added catalysts dependencie
kailuowang e3cc9d0
cats tests passes
kailuowang 44a6ade
fix mima
kailuowang 94c4a02
minor removed old 2.10 specific settings
kailuowang f21ad1d
updated alleycats
kailuowang 855f730
disable scoverage on 2.13
kailuowang 83c1e77
fix catalyst 0.7
kailuowang 3173a20
fix format
kailuowang 481f431
fix bc with exception
kailuowang 42ae55e
ignore tut for now on 2.13
kailuowang e6ae985
fixing build
kailuowang 85f20ad
updated scalafix version
kailuowang 82af3a7
fix travis build
kailuowang 8f4e863
fixing travis
kailuowang 9656764
fix travis
kailuowang 4ab0946
updated scalafix version
kailuowang 228bbe1
fixing scalafix
kailuowang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
alleycats-core/src/main/scala-2.12-/alleycats/compat/IterableEmptyInstance.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package alleycats | ||
package compat | ||
|
||
import scala.collection.generic.CanBuildFrom | ||
|
||
abstract class IterableEmptyInstance { | ||
implicit def iterableIsEmpty[CC[X] <: Iterable[X], A](implicit cbf: CanBuildFrom[CC[A], A, CC[A]]): Empty[CC[A]] = | ||
Empty(cbf().result) | ||
} |
9 changes: 9 additions & 0 deletions
9
alleycats-core/src/main/scala-2.13+/alleycats/compat/IterableEmptyInstance.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package alleycats | ||
package compat | ||
|
||
import collection.Factory | ||
|
||
abstract class IterableEmptyInstance { | ||
implicit def iterableIsEmpty[CC[X] <: Iterable[X], A](implicit factory: Factory[A, CC[A]]): Empty[CC[A]] = | ||
Empty(factory.newBuilder.result) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
package cats | ||
package compat | ||
|
||
import scala.collection.immutable | ||
|
||
|
||
private[cats] object SortedSet { | ||
def zipWithIndex[A](s: immutable.SortedSet[A])(implicit A: Ordering[A]): immutable.SortedSet[(A, Int)] = | ||
s.zipWithIndex | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package cats | ||
package compat | ||
|
||
import scala.collection.immutable | ||
|
||
private[cats] object SortedSet { | ||
def zipWithIndex[A](s: immutable.SortedSet[A])(implicit A: Ordering[A]): immutable.SortedSet[(A, Int)] = | ||
s.zipWithIndex.to(immutable.SortedSet) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This would be a good option to add to mima: ignore changes when the or trait is sealed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I created a placeholder issue at the mima repo, but it needs fleshing out to become actionable. lightbend-labs/mima#237