Skip to content

Commit

Permalink
Merge pull request Cleveroad#21 from Cleveroad/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ponomarenko-cr authored Aug 3, 2016
2 parents 07bfe27 + 8903d25 commit 1d50c0e
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
/.idea
.DS_Store
/build
build
/captures
gradlew*
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ To include this library to your project add dependency in **build.gradle** file:

```groovy
dependencies {
compile 'com.cleveroad:audiovisualization:0.9.3'
compile 'com.cleveroad:audiovisualization:0.9.4'
}
```

Expand Down Expand Up @@ -166,7 +166,8 @@ Your handler also will receive **onResume()**, **onPause()** and **release()** e

| Version | Changes |
| --- | --- |
| v.0.9.3 | Fixed concurrent modification exception. Added ability to set number of bubbles per layer "
| v.0.9.4 | Fixed issues |
| v.0.9.3 | Fixed concurrent modification exception. Added ability to set number of bubbles per layer |
| v.0.9.2 | Added voice recording example. Added ability to build audio visualization renderer. |
| v.0.9.1 | Added ability to set custom dBm handler implementations; implemented SpeechRecognizerDbmHandler |
| v.0.9.0 | First public release |
Expand Down
3 changes: 1 addition & 2 deletions app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,4 @@ atlassian-ide-plugin.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties

crashlytics-build.properties
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 24
buildToolsVersion "24.0.0"

defaultConfig {
applicationId "com.cleveroad.audiovisualization.example"
minSdkVersion 11
targetSdkVersion 23
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
Expand All @@ -22,6 +22,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:appcompat-v7:24.1.1'
compile project(':library')
}
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
VERSION_NAME=0.9.3
VERSION_CODE=4
VERSION_NAME=0.9.4
VERSION_CODE=5
GROUP=com.cleveroad

POM_DESCRIPTION=Implementation of music player concept. When music plays the waves are active, and once it is paused or stopped waves calm down.
POM_DESCRIPTION=Implementation of music player concept. When music plays the waves are active, and once it is paused or stopped waves calm down.

POM_URL=https://github.com/Cleveroad/WaveInApp
POM_SCM_URL=https://github.com/Cleveroad/WaveInApp
Expand Down
8 changes: 4 additions & 4 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 24
buildToolsVersion "24.0.0"

defaultConfig {
minSdkVersion 11
targetSdkVersion 23
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
Expand All @@ -23,7 +23,7 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:appcompat-v7:24.1.1'
}

apply from: './gradle-mvn-push.gradle'

0 comments on commit 1d50c0e

Please sign in to comment.