Merge branch 'audiorecorder-1.5.0'

This commit is contained in:
Alexey Kuznetsov 2017-05-14 19:43:50 +03:00
commit e5bb97e842
3 changed files with 6 additions and 6 deletions

View file

@ -8,8 +8,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 23
versionCode 128
versionName "1.4.26"
versionCode 129
versionName "1.5.0"
}
signingConfigs {
release {
@ -43,5 +43,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.github.axet:android-audio-library:0.0.29' // compile project(':android-audio-library')
compile 'com.github.axet:android-audio-library:0.0.34' // compile project(':android-audio-library')
}

View file

@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.android.tools.build:gradle:2.3.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@ -20,7 +20,7 @@ allprojects {
}
task wrapper(type: Wrapper) {
gradleVersion = '3.3'
gradleVersion = '3.5'
}
task clean(type: Delete) {

View file

@ -1 +1 @@
include ':app', ':android-library', ':jebml', ':android-audio-library', ':android-vorbis', ':android-vorbis:libvorbis', ':android-vorbis:libogg'
include ':app', ':android-library', ':jebml', ':android-audio-library', ':android-vorbis', ':android-vorbis:libvorbis', ':android-vorbis:libogg', ":android-lame", ':android-lame:liblame'