Merge pull request #3 from Stipess1/master

Updated extractor to latest version
Stipess1 · Jan 14, 2021 · e3fabd0 · e3fabd0
2 parents 8b881d4 + c8bb936
commit e3fabd0
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 34 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.stipess.youplay"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 72
-        versionName "2.1.9"
+        versionCode 73
+        versionName "2.2.0"
         buildConfigField 'String', 'YOUPLAY_WEBSITE', '"https://youplayandroid.com"'
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -25,8 +25,8 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled true
-            useProguard true
+            minifyEnabled false
+            useProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             android.applicationVariants.all { variant ->
                 variant.outputs.all {
@@ -35,8 +35,8 @@ android {
             }
         }
         debug {
-            minifyEnabled true
-            useProguard true
+            minifyEnabled false
+            useProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             android.applicationVariants.all { variant ->
                 variant.outputs.all {
@@ -48,6 +48,7 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
     }
     productFlavors {
     }
@@ -67,7 +68,7 @@ dependencies {
     implementation 'com.liulishuo.filedownloader:library:1.7.7'
     implementation 'com.google.firebase:firebase-core:18.0.0'
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:0.20.5'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:0.20.8'
     implementation "com.squareup.okhttp3:okhttp:3.12.11"
     implementation 'org.jsoup:jsoup:1.13.1'
     implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
@@ -87,6 +88,7 @@ dependencies {
     implementation 'com.google.gms:google-services:4.3.4'
     implementation 'com.google.android.exoplayer:exoplayer:2.11.7'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.0'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9'
 
 }
 

diff --git a/app/src/main/java/com/stipess/youplay/AudioService.java b/app/src/main/java/com/stipess/youplay/AudioService.java
@@ -392,7 +392,8 @@ public Notification initNotification(String title, String image, String author)
                 .addAction(R.drawable.next , "next", next_btn)
                 .addAction(R.drawable.cancel, "cancel", cancel_btn)
                 .setStyle(new androidx.media.app.NotificationCompat.MediaStyle().setMediaSession(mediaSessionCompat.getSessionToken()).setShowActionsInCompactView(0,1,2))
-                .setOngoing(true);
+                .setOngoing(true)
+                .setShowWhen(false);
         if(id.equals("5385"))
             builder.setChannelId(id);
 

diff --git a/app/src/main/java/com/stipess/youplay/youtube/loaders/YoutubeMusicLoader.java b/app/src/main/java/com/stipess/youplay/youtube/loaders/YoutubeMusicLoader.java
@@ -2,7 +2,6 @@
 
 
 import android.content.Context;
-import android.util.Log;
 
 import androidx.loader.content.AsyncTaskLoader;
 
@@ -12,8 +11,6 @@
 import com.stipess.youplay.utils.FileManager;
 import com.stipess.youplay.utils.Utils;
 
-
-import org.schabi.newpipe.extractor.Info;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'com.google.gms:google-services:4.2.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Oct 18 15:46:03 CEST 2020
+#Sat Dec 26 11:04:27 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip