From ae2ba5771fcc3fa7ecdcd3236576c07cd0cfceeb Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 26 Feb 2022 16:07:33 -0500 Subject: [PATCH 1/3] Update Kotlin to 1.6.10 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f7717a4ff..7dda1cf7a 100644 --- a/build.gradle +++ b/build.gradle @@ -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() From 678edb18465117800d85fbd562d19ff619e6f13c Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 26 Feb 2022 16:08:10 -0500 Subject: [PATCH 2/3] Update ktlint to 0.44.0 --- app/build.gradle | 2 +- .../main/java/org/schabi/newpipe/local/feed/FeedFragment.kt | 3 +-- .../java/org/schabi/newpipe/util/urlfinder/UrlFinderTest.kt | 6 ++++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bd19be914..9d705088b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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}" diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt index 8285d21e6..dc877e149 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt @@ -452,8 +452,7 @@ class FeedFragment : BaseStateFragment() { }.subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe( - { - subscriptionEntity -> + { subscriptionEntity -> handleFeedNotAvailable( subscriptionEntity, t.cause, diff --git a/app/src/test/java/org/schabi/newpipe/util/urlfinder/UrlFinderTest.kt b/app/src/test/java/org/schabi/newpipe/util/urlfinder/UrlFinderTest.kt index ac8e4c8da..5e8a212b2 100644 --- a/app/src/test/java/org/schabi/newpipe/util/urlfinder/UrlFinderTest.kt +++ b/app/src/test/java/org/schabi/newpipe/util/urlfinder/UrlFinderTest.kt @@ -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) From 19d4e2224b9da8b75982dfb7b34c5ccbad0e2ece Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 26 Feb 2022 16:10:23 -0500 Subject: [PATCH 3/3] Update Checkstyle to 9.3 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 9d705088b..fd2d7dfab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,7 +98,7 @@ android { } ext { - checkstyleVersion = '9.2.1' + checkstyleVersion = '9.3' androidxLifecycleVersion = '2.3.1' androidxRoomVersion = '2.4.1'