Merge branch 'audiorecorder-3.2.60'

app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.github.axet.dxplugin'
 
 android {
     compileSdkVersion 25
@@ -8,8 +9,8 @@ android {
         applicationId "com.github.axet.audiorecorder"
         minSdkVersion 9
         targetSdkVersion 26
-        versionCode 317
-        versionName "3.2.59"
+        versionCode 318
+        versionName "3.2.60"
     }
     signingConfigs {
         release {
@@ -52,5 +53,6 @@ android {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    implementation 'com.github.axet:android-audio-library:1.0.149' // implementation project(':android-audio-library')
+    implementation 'com.github.axet:android-audio-library:1.0.150' // implementation project(':android-audio-library')
+    assets('com.google.android.exoplayer:exoplayer:2.7.3') { exclude group: 'com.android.support' }
 }

build.gradle

@@ -6,6 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.github.axet:gradle-android-dx:0.0.4'
     }
 }