Refresh gradle settings

lincollincol · Mar 26, 2021 · 9594cef · 9594cef
1 parent fdfa9e9
commit 9594cef
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "linc.com.audiotool"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -24,10 +24,10 @@ android {
 }
 
 dependencies {
-    implementation project(":library")
+//    implementation project(":library")
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.arthenica:mobile-ffmpeg-full:4.3.1.LTS'
-//    implementation 'com.github.lincollincol:AudioTool:1.2'
+    implementation 'com.github.lincollincol:AudioTool:1.2'
 }
diff --git a/app/src/main/java/linc/com/audiotool/MainActivity.java b/app/src/main/java/linc/com/audiotool/MainActivity.java
@@ -10,10 +10,6 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 
-//import com.arthenica.mobileffmpeg.Config;
-//import com.arthenica.mobileffmpeg.FFprobe;
-//import com.arthenica.mobileffmpeg.Level;
-
 import java.util.Arrays;
 import java.util.List;
 
@@ -24,8 +20,6 @@
 import linc.com.library.types.Duration;
 import linc.com.library.types.Echo;
 
-//import static com.arthenica.mobileffmpeg.Config.RETURN_CODE_SUCCESS;
-
 public class MainActivity extends AppCompatActivity {
 
     @Override
@@ -39,13 +33,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                         Manifest.permission.WRITE_EXTERNAL_STORAGE
                 }, 1);
 
-
-
         try {
             AudioTool.getInstance(this)
-                    .withAudio("/storage/emulated/0/Music/kygo.mp3")
+                    .withAudio("/storage/emulated/0/Music/Linc - AudioTool.mp3")
                     .applyEchoEffect(Echo.ECHO_FEW_MOUNTAINS, null)
-                    .saveCurrentTo("/storage/emulated/0/Music/echo.mp3")
+                    .saveCurrentTo("/storage/emulated/0/Music/Linc - AudioTool_With_Echo.mp3")
                     .release();
         } catch (Exception e) {
             e.printStackTrace();

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
 
         // 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 @@
-#Fri Aug 07 22:53:43 EEST 2020
+#Fri Mar 26 17:42:07 CET 2021
 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
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="linc.com.library">
-<!--    <uses-sdk tools:overrideLibrary="com.arthenica.mobileffmpeg" />-->
 </manifest>
diff --git a/library/src/main/java/linc/com/library/AudioTool.java b/library/src/main/java/linc/com/library/AudioTool.java
@@ -19,8 +19,6 @@
 import linc.com.library.callback.OnFileComplete;
 import linc.com.library.callback.OnNumberComplete;
 import linc.com.library.callback.OnListComplete;
-import linc.com.library.ffmpeg.LogCallback;
-import linc.com.library.ffmpeg.LogLevel;
 import linc.com.library.types.Duration;
 import linc.com.library.types.Echo;
 import linc.com.library.types.Pitch;