From 84d87a2e608978d82ab4f06393fb94839d0342b9 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 4 Dec 2021 21:16:37 -0500 Subject: [PATCH 1/4] Move plugins to the DSL block --- app/build.gradle | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4d4c2d9d1..94c623e13 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,12 @@ plugins { + id "com.android.application" + id "kotlin-android" + id "kotlin-kapt" + id "kotlin-parcelize" + id "checkstyle" id "org.sonarqube" version "3.1.1" } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-parcelize' -apply plugin: 'kotlin-kapt' -apply plugin: 'checkstyle' - android { compileSdkVersion 30 buildToolsVersion '30.0.3' @@ -80,13 +79,13 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 encoding 'utf-8' } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 + jvmTarget = JavaVersion.VERSION_11 } sourceSets { From dbfa4e554b85064e6c29b78df6512dec397912f6 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 4 Dec 2021 21:22:15 -0500 Subject: [PATCH 2/4] Update Sonarqube to 3.3 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 94c623e13..25ad5c43c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ plugins { id "kotlin-kapt" id "kotlin-parcelize" id "checkstyle" - id "org.sonarqube" version "3.1.1" + id "org.sonarqube" version "3.3" } android { From 75db002369aa9c709806e4c39c01629fa1436e81 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 4 Dec 2021 21:22:29 -0500 Subject: [PATCH 3/4] Update ktlint to 0.43.2 --- app/build.gradle | 2 +- .../schabi/newpipe/local/feed/service/FeedLoadService.kt | 8 -------- .../schabi/newpipe/settings/ContentSettingsManagerTest.kt | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 25ad5c43c..ba92d97c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -192,7 +192,7 @@ dependencies { /** Checkstyle **/ checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}" - ktlint 'com.pinterest:ktlint:0.40.0' + ktlint 'com.pinterest:ktlint:0.43.2' /** Kotlin **/ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}" diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt index 98ff5914d..5bc097fe5 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt @@ -183,28 +183,23 @@ class FeedLoadService : Service() { subscriptions .take(1) - .doOnNext { currentProgress.set(0) maxProgress.set(it.size) } .filter { it.isNotEmpty() } - .observeOn(AndroidSchedulers.mainThread()) .doOnNext { startForeground(NOTIFICATION_ID, notificationBuilder.build()) updateNotificationProgress(null) broadcastProgress() } - .observeOn(Schedulers.io()) .flatMap { Flowable.fromIterable(it) } .takeWhile { !cancelSignal.get() } - .parallel(PARALLEL_EXTRACTIONS, PARALLEL_EXTRACTIONS * 2) .runOn(Schedulers.io(), PARALLEL_EXTRACTIONS * 2) .filter { !cancelSignal.get() } - .map { subscriptionEntity -> var error: Throwable? = null try { @@ -239,14 +234,11 @@ class FeedLoadService : Service() { } } .sequential() - .observeOn(AndroidSchedulers.mainThread()) .doOnNext(notificationsConsumer) - .observeOn(Schedulers.io()) .buffer(BUFFER_COUNT_BEFORE_INSERT) .doOnNext(databaseConsumer) - .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(resultSubscriber) diff --git a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt index 2311b41ce..ec41a77f8 100644 --- a/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt +++ b/app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt @@ -9,12 +9,12 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito -import org.mockito.Mockito.`when` import org.mockito.Mockito.anyBoolean import org.mockito.Mockito.anyInt import org.mockito.Mockito.anyString import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` import org.mockito.Mockito.withSettings import org.mockito.junit.MockitoJUnitRunner import org.schabi.newpipe.streams.io.StoredFileHelper From f86fc03c466a0b2417071cd9ec37b78788ee3eae Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 4 Dec 2021 21:30:23 -0500 Subject: [PATCH 4/4] Update Checkstyle to 9.2 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ba92d97c7..319306901 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,7 +98,7 @@ android { } ext { - checkstyleVersion = '8.38' + checkstyleVersion = '9.2' androidxLifecycleVersion = '2.3.1' androidxRoomVersion = '2.3.0'