Skip to content

Commit f1c6988

Browse files
authored
Merge pull request #7952 from TacoTheDank/bumpKotlin
Update Kotlin to 1.6.10
2 parents e1197f7 + 19d4e22 commit f1c6988

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ android {
9898
}
9999

100100
ext {
101-
checkstyleVersion = '9.2.1'
101+
checkstyleVersion = '9.3'
102102

103103
androidxLifecycleVersion = '2.3.1'
104104
androidxRoomVersion = '2.4.2'
@@ -193,7 +193,7 @@ dependencies {
193193

194194
/** Checkstyle **/
195195
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
196-
ktlint 'com.pinterest:ktlint:0.43.2'
196+
ktlint 'com.pinterest:ktlint:0.44.0'
197197

198198
/** Kotlin **/
199199
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"

app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
452452
}.subscribeOn(Schedulers.io())
453453
.observeOn(AndroidSchedulers.mainThread())
454454
.subscribe(
455-
{
456-
subscriptionEntity ->
455+
{ subscriptionEntity ->
457456
handleFeedNotAvailable(
458457
subscriptionEntity,
459458
t.cause,

app/src/test/java/org/schabi/newpipe/util/urlfinder/UrlFinderTest.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ class UrlFinderTest {
1919
|Dapibus ultrices in iaculis nunc sed augue lacus viverra. Nisl purus in mollis nunc.
2020
|Viverra nibh cras pulvinar mattis. ####!@!@!@!#### Not this one: https://www.youtube.com/playlist?list=SHOULD_NOT Nunc sed blandit libero volutpat.
2121
|Nisl tincidunt eget nullam non nisi est sit amet. Purus in massa tempor nec feugiat nisl pretium fusce id.
22-
|Vulputate eu scelerisque felis imperdiet proin fermentum leo vel.""".trimMargin()
22+
|Vulputate eu scelerisque felis imperdiet proin fermentum leo vel.
23+
""".trimMargin()
2324
)
2425

2526
assertEquals(expected, result)
@@ -35,7 +36,8 @@ class UrlFinderTest {
3536
|Dapibus ultrices in iaculis nunc sed augue lacus viverra. Nisl purus in mollis nunc.
3637
|Viverra nibh cras pulvinar mattis. Not this one: sed blandit libero volutpat.
3738
|Nisl tincidunt eget nullam non nisi est sit amet. Purus in massa tempor nec feugiat nisl pretium fusce id.
38-
|Vulputate eu scelerisque felis imperdiet proin fermentum leo vel.""".trimMargin()
39+
|Vulputate eu scelerisque felis imperdiet proin fermentum leo vel.
40+
""".trimMargin()
3941
)
4042

4143
assertEquals(null, result)

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.5.31'
4+
ext.kotlin_version = '1.6.10'
55
repositories {
66
google()
77
mavenCentral()

0 commit comments

Comments
 (0)