extractor 21.6

Isayso · Aug 3, 2021 · a723979 · a723979
1 parent 42a8035
commit a723979
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 50 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,16 +6,16 @@ apply plugin: 'checkstyle'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion '29.0.3'
+    buildToolsVersion '30.0.3'
 
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 965
-        versionName "19.9.11 Isayso Fork"
+        versionCode 972
+        versionName "19.9.13 Isayso Fork"
         multiDexEnabled true  //Isayso
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -91,16 +91,33 @@ android {
     androidxRoomVersion = '2.2.5'
     groupieVersion = '2.8.0'
     markwonVersion = '4.3.1'
+
+        checkstyleVersion = '8.38'
+
+    androidxLifecycleVersion = '2.2.0'
+    androidxRoomVersion = '2.3.0'
+
+    icepickVersion = '3.2.0'
+    exoPlayerVersion = '2.12.3'
+    googleAutoServiceVersion = '1.0-rc7'
+    groupieVersion = '2.8.1'
+    markwonVersion = '4.6.0'
+
+    leakCanaryVersion = '2.5'
+    stethoVersion = '1.5.1'
+    mockitoVersion = '3.6.0'
+
+
 }*/
 
 ext {
     icepickVersion = '3.2.0'
-    checkstyleVersion = '8.36.2'
+    checkstyleVersion = '8.38'
     stethoVersion = '1.5.1'
     leakCanaryVersion = '2.2'
-    exoPlayerVersion = '2.11.8'
-    androidxLifecycleVersion = '2.2.0'
-    androidxRoomVersion = '2.2.5'
+    exoPlayerVersion = '2.11.8'  //do not change
+    androidxLifecycleVersion = '2.2.0'  //do not change
+    androidxRoomVersion = '2.3.0'
     groupieVersion = '2.8.0'
     markwonVersion = '4.3.1'
     googleAutoServiceVersion = '1.0-rc7'
@@ -142,14 +159,15 @@ task runCheckstyle(type: Checkstyle) {
 //    args "src/**/*.kt"
 //}
 
+
 //task formatKtlint(type: JavaExec) {
 //    main = "com.pinterest.ktlint.Main"
 //    classpath = configurations.ktlint
 //    args "-F", "src/**/*.kt"
 //}
 
 afterEvaluate {
-    preDebugBuild.dependsOn runCheckstyle//, runKtlint
+    preDebugBuild.dependsOn runCheckstyle //, runKtlint
 }
 
 dependencies {
@@ -164,8 +182,8 @@ dependencies {
     implementation "frankiesardo:icepick:${icepickVersion}"
     kapt "frankiesardo:icepick-processor:${icepickVersion}"
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:8.37'
-//    ktlint 'com.pinterest:ktlint:0.39.0'
+    checkstyle 'com.puppycrawl.tools:checkstyle:8.38'
+  //  ktlint 'com.pinterest:ktlint:0.39.0'
 
     debugImplementation "com.facebook.stetho:stetho:${stethoVersion}"
     debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"
@@ -175,34 +193,17 @@ dependencies {
 
     debugImplementation "androidx.multidex:multidex:2.0.1"
 
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:3.6.0'
 
-    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0', {
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0', {
         exclude module: 'support-annotations'
     }
-
-        //version 965
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.20.11'
-
-    //Version 960
-   // implementation 'com.github.TeamNewPipe:NewPipeExtractor:b3835bd616ab28b861c83dcefd56e1754c6d20be'
 
-    //Version 959
-  //  implementation 'com.github.TeamNewPipe:NewPipeExtractor:175df679e05b24b6094570d719cc11f8dfc17c68'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.21.6'
 
-    //Version 958
-   // implementation 'com.github.TeamNewPipe:NewPipeExtractor:650f0920fea535e08728d895d7b21f19c740817c'
-
-    //Version code 957
-   // implementation 'com.github.TeamNewPipe:NewPipeExtractor:6701b0fe718f6bdc385221341fa473e8aaab560e'
-
-//Version code 956
-//    implementation 'com.github.TeamNewPipe:NewPipeExtractor:19c0e8700db3af35e5dfc58e4eea50e75d7c4c61'
-
-  //  implementation 'com.github.TeamNewPipe:NewPipeExtractor:a8665fd97f223f41190fa04569af723be9e03008'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"
@@ -212,13 +213,13 @@ dependencies {
     implementation "com.google.android.exoplayer:exoplayer:${exoPlayerVersion}"
     implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerVersion}"
 
-    implementation "com.google.android.material:material:1.2.1"
+    implementation "com.google.android.material:material:1.4.0"
 
-    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation "androidx.cardview:cardview:1.0.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
 
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:${androidxLifecycleVersion}"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${androidxLifecycleVersion}"
@@ -239,13 +240,13 @@ dependencies {
 
     implementation "com.nononsenseapps:filepicker:4.2.1"
 
-    implementation "ch.acra:acra-core:5.5.0"
+    implementation "ch.acra:acra-core:5.7.0"
 
     implementation "io.reactivex.rxjava2:rxjava:2.2.19"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
     implementation "com.jakewharton.rxbinding2:rxbinding:2.2.0"
 
-    implementation "org.ocpsoft.prettytime:prettytime:4.0.6.Final"
+    implementation "org.ocpsoft.prettytime:prettytime:5.0.1.Final"
 }
 
 static String getGitWorkingBranch() {
@@ -268,4 +269,4 @@ allprojects {
     tasks.withType(JavaCompile) {
         options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
     }
-}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -1155,9 +1155,6 @@ public void handleResult(@NonNull final StreamInfo info) {
                 relatedStreamsLayout.setVisibility(View.VISIBLE);
             }
         }
-
-        //pushToStack(serviceId, url, name);
-
         animateView(thumbnailPlayButton, true, 200);
         videoTitleTextView.setText(name);
 

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -22,8 +22,7 @@
 
     <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
     <module name="SuppressionFilter">
-        <property name="file" value="${org.checkstyle.sun.suppressionfilter.config}"
-                  default="checkstyle-suppressions.xml" />
+        <property name="file" value="${config_loc}/checkstyle-suppressions.xml" />
         <property name="optional" value="true"/>
     </module>
 
@@ -40,10 +39,12 @@
     <module name="Translation"/>
 
     <!-- Checks for Size Violations.                    -->
-    <!-- See https://checkstyle.org/config_sizes.html -->
-    <module name="FileLength"/>
+   <!-- See https://checkstyle.org/config_sizes.html -->
+    <module name="FileLength">
+	  <property name="max" value="5000"/>
+	</module>
     <module name="LineLength">
-      <property name="max" value="100"/>
+      <property name="max" value="150"/>
       <property name="fileExtensions" value="java"/>
     </module>
 
@@ -67,6 +68,8 @@
     <!--   <property name="fileExtensions" value="java"/> -->
     <!-- </module> -->
 
+    <module name="SuppressWarningsFilter" />
+
     <module name="TreeWalker">
         <!-- Checks for Javadoc comments.                     -->
         <!-- See https://checkstyle.org/config_javadoc.html -->
@@ -102,6 +105,7 @@
         <!-- See https://checkstyle.org/config_sizes.html -->
         <module name="MethodLength">
             <property name="severity" value="warning"/>
+			<property name="max" value="300"/>
         </module>
         <module name="ParameterNumber">
             <property name="severity" value="warning"/>
@@ -152,6 +156,11 @@
         <module name="MultipleVariableDeclarations"/>
         <module name="SimplifyBooleanExpression"/>
         <module name="SimplifyBooleanReturn"/>
+        <module name="FinalLocalVariable">
+            <property name="tokens" value="VARIABLE_DEF,PARAMETER_DEF"/>
+            <property name="validateEnhancedForLoopVariable" value="true"/>
+			 <property name="severity" value="warning"/>
+        </module>
 
         <!-- Checks for class design                         -->
         <!-- See https://checkstyle.org/config_design.html -->
@@ -167,13 +176,17 @@
         <!-- Miscellaneous other checks.                   -->
         <!-- See https://checkstyle.org/config_misc.html -->
         <module name="ArrayTypeStyle"/>
-        <module name="FinalParameters"/>
+        <module name="FinalParameters">
+		            <property name="severity" value="warning"/>
+        </module>
         <!--<module name="TodoComment">
             <property name="format" value="(TODO:|FIXME:)"/>
             <property name="severity" value="warning"/>
         </module>-->
         <module name="UpperEll"/>
 
+        <module name="SuppressWarningsHolder" />
+
         <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
         <module name="SuppressionXpathFilter">
             <property name="file" value="${org.checkstyle.sun.suppressionxpathfilter.config}"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 android.useAndroidX=true