From a1e72cd5d17986118b2249743e759401f90b4cb6 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 2 Sep 2017 23:41:38 +0300 Subject: [PATCH] Updated versions, fixed typos in Readme --- README.md | 2 +- app/build.gradle | 8 ++++---- audiowave/build.gradle | 4 ++-- audiowave/src/main/kotlin/rm/com/audiowave/Sampler.kt | 2 +- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 19c59d9..bf394bc 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ Set raw byte array asynchronously setRawData(byte[] data, OnSamplingListener callback); ``` -In case you have an scaled byte array you want to draw, as in, an array whose size is the amount of chunks to draw +In case you have a scaled byte array you want to draw, i. e. an array whose size is the amount of chunks to draw ```java diff --git a/app/build.gradle b/app/build.gradle index a0c49ee..5ee9d88 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 25 - buildToolsVersion "25.0.0" + buildToolsVersion "25.0.2" defaultConfig { applicationId "rm.com.audiogram" minSdkVersion 15 @@ -26,9 +26,9 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "com.android.support:recyclerview-v7:25.1.0" - compile 'com.android.support:appcompat-v7:25.1.0' - // compile 'com.github.alxrm:audiowave-progressbar:0.7' + compile "com.android.support:recyclerview-v7:25.3.1" + compile 'com.android.support:appcompat-v7:25.3.1' +// compile 'com.github.alxrm:audiowave-progressbar:0.8' compile "com.jakewharton:butterknife:8.5.1" compile "com.jakewharton:butterknife-compiler:8.5.1" diff --git a/audiowave/build.gradle b/audiowave/build.gradle index bb81ce8..200d068 100644 --- a/audiowave/build.gradle +++ b/audiowave/build.gradle @@ -3,13 +3,13 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 25 - buildToolsVersion "25.0.0" + buildToolsVersion "25.0.2" defaultConfig { minSdkVersion 15 targetSdkVersion 25 versionCode 1 - versionName "0.7" + versionName "0.9" } buildTypes { release { diff --git a/audiowave/src/main/kotlin/rm/com/audiowave/Sampler.kt b/audiowave/src/main/kotlin/rm/com/audiowave/Sampler.kt index 6a1a615..2c40309 100644 --- a/audiowave/src/main/kotlin/rm/com/audiowave/Sampler.kt +++ b/audiowave/src/main/kotlin/rm/com/audiowave/Sampler.kt @@ -66,7 +66,7 @@ internal fun ByteArray.paste(other: ByteArray): ByteArray { if (size == 0) return byteArrayOf() return this.apply { - forEachIndexed { i, byte -> + forEachIndexed { i, _ -> this[i] = other.getOrElse(i, { this[i].abs }) } } diff --git a/build.gradle b/build.gradle index 55c9263..72634bd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.0.6' + ext.kotlin_version = '1.1.2-3' repositories { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..c8c57dd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Thu Apr 27 01:18:47 MSK 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip