mirror of
https://github.com/TeamNewPipe/NewPipe.git
synced 2024-11-21 18:42:35 +01:00
Merge pull request #7952 from TacoTheDank/bumpKotlin
Update Kotlin to 1.6.10
This commit is contained in:
commit
f1c6988552
@ -98,7 +98,7 @@ android {
|
||||
}
|
||||
|
||||
ext {
|
||||
checkstyleVersion = '9.2.1'
|
||||
checkstyleVersion = '9.3'
|
||||
|
||||
androidxLifecycleVersion = '2.3.1'
|
||||
androidxRoomVersion = '2.4.2'
|
||||
@ -193,7 +193,7 @@ dependencies {
|
||||
|
||||
/** Checkstyle **/
|
||||
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
|
||||
ktlint 'com.pinterest:ktlint:0.43.2'
|
||||
ktlint 'com.pinterest:ktlint:0.44.0'
|
||||
|
||||
/** Kotlin **/
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
|
||||
|
@ -452,8 +452,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
|
||||
}.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(
|
||||
{
|
||||
subscriptionEntity ->
|
||||
{ subscriptionEntity ->
|
||||
handleFeedNotAvailable(
|
||||
subscriptionEntity,
|
||||
t.cause,
|
||||
|
@ -19,7 +19,8 @@ class UrlFinderTest {
|
||||
|Dapibus ultrices in iaculis nunc sed augue lacus viverra. Nisl purus in mollis nunc.
|
||||
|Viverra nibh cras pulvinar mattis. ####!@!@!@!#### Not this one: https://www.youtube.com/playlist?list=SHOULD_NOT Nunc sed blandit libero volutpat.
|
||||
|Nisl tincidunt eget nullam non nisi est sit amet. Purus in massa tempor nec feugiat nisl pretium fusce id.
|
||||
|Vulputate eu scelerisque felis imperdiet proin fermentum leo vel.""".trimMargin()
|
||||
|Vulputate eu scelerisque felis imperdiet proin fermentum leo vel.
|
||||
""".trimMargin()
|
||||
)
|
||||
|
||||
assertEquals(expected, result)
|
||||
@ -35,7 +36,8 @@ class UrlFinderTest {
|
||||
|Dapibus ultrices in iaculis nunc sed augue lacus viverra. Nisl purus in mollis nunc.
|
||||
|Viverra nibh cras pulvinar mattis. Not this one: sed blandit libero volutpat.
|
||||
|Nisl tincidunt eget nullam non nisi est sit amet. Purus in massa tempor nec feugiat nisl pretium fusce id.
|
||||
|Vulputate eu scelerisque felis imperdiet proin fermentum leo vel.""".trimMargin()
|
||||
|Vulputate eu scelerisque felis imperdiet proin fermentum leo vel.
|
||||
""".trimMargin()
|
||||
)
|
||||
|
||||
assertEquals(null, result)
|
||||
|
@ -1,7 +1,7 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
|
||||
buildscript {
|
||||
ext.kotlin_version = '1.5.31'
|
||||
ext.kotlin_version = '1.6.10'
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
|
Loading…
Reference in New Issue
Block a user