From 219b32bbcce1481ae5bb638d12bca371acc59df0 Mon Sep 17 00:00:00 2001 From: wasabeef Date: Thu, 21 Apr 2016 15:18:48 +0900 Subject: [PATCH 1/6] format --- transformations/build.gradle | 50 +++++++++---------- .../transformations/ApplicationTest.java | 6 +-- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/transformations/build.gradle b/transformations/build.gradle index 7c90c62..db3e91a 100644 --- a/transformations/build.gradle +++ b/transformations/build.gradle @@ -2,49 +2,49 @@ apply plugin: 'com.android.library' apply plugin: 'com.novoda.bintray-release' android { - compileSdkVersion COMPILE_SDK_VERSION as int - buildToolsVersion BUILD_TOOLS_VERSION + compileSdkVersion COMPILE_SDK_VERSION as int + buildToolsVersion BUILD_TOOLS_VERSION - defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int - versionCode "git rev-list origin/master --count".execute().text.toInteger() - versionName VERSION_NAME + defaultConfig { + minSdkVersion MIN_SDK_VERSION as int + targetSdkVersion TARGET_SDK_VERSION as int + versionCode "git rev-list origin/master --count".execute().text.toInteger() + versionName VERSION_NAME - consumerProguardFiles 'proguard-rules.txt' - } + consumerProguardFiles 'proguard-rules.txt' + } } dependencies { - compile "com.github.bumptech.glide:glide:${GLIDE_VERSION}" - provided "jp.co.cyberagent.android.gpuimage:gpuimage-library:${GPUIMAGE_VERSION}" + compile "com.github.bumptech.glide:glide:${GLIDE_VERSION}" + provided "jp.co.cyberagent.android.gpuimage:gpuimage-library:${GPUIMAGE_VERSION}" } task androidJavadocs(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + source = android.sourceSets.main.java.srcDirs + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) } task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { - classifier = 'javadoc' - from androidJavadocs.destinationDir + classifier = 'javadoc' + from androidJavadocs.destinationDir } task androidSourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.srcDirs + classifier = 'sources' + from android.sourceSets.main.java.srcDirs } artifacts { - archives androidSourcesJar - archives androidJavadocsJar + archives androidSourcesJar + archives androidJavadocsJar } publish { - userOrg = POM_DEVELOPER_ID - groupId = GROUP - artifactId = ARTIFACT_ID - publishVersion = VERSION_NAME - desc = POM_DESCRIPTION - website = POM_URL + userOrg = POM_DEVELOPER_ID + groupId = GROUP + artifactId = ARTIFACT_ID + publishVersion = VERSION_NAME + desc = POM_DESCRIPTION + website = POM_URL } diff --git a/transformations/src/androidTest/java/jp/wasabeef/glide/transformations/ApplicationTest.java b/transformations/src/androidTest/java/jp/wasabeef/glide/transformations/ApplicationTest.java index 12219bd..10a6eb7 100644 --- a/transformations/src/androidTest/java/jp/wasabeef/glide/transformations/ApplicationTest.java +++ b/transformations/src/androidTest/java/jp/wasabeef/glide/transformations/ApplicationTest.java @@ -8,7 +8,7 @@ import android.test.ApplicationTestCase; */ public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } + public ApplicationTest() { + super(Application.class); + } } \ No newline at end of file From 9bea464afc142013b14afc5cbe7334a6b10c3204 Mon Sep 17 00:00:00 2001 From: wasabeef Date: Thu, 21 Apr 2016 15:22:21 +0900 Subject: [PATCH 2/6] format --- example/build.gradle | 68 ++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/example/build.gradle b/example/build.gradle index ce030c0..95d1cc5 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -1,58 +1,58 @@ apply plugin: 'com.android.application' android { - compileSdkVersion COMPILE_SDK_VERSION as int - buildToolsVersion BUILD_TOOLS_VERSION + compileSdkVersion COMPILE_SDK_VERSION as int + buildToolsVersion BUILD_TOOLS_VERSION - defaultConfig { - minSdkVersion MIN_SDK_VERSION as int - targetSdkVersion TARGET_SDK_VERSION as int - versionCode "git rev-list origin/master --count".execute().text.toInteger() - versionName VERSION_NAME - } + defaultConfig { + minSdkVersion MIN_SDK_VERSION as int + targetSdkVersion TARGET_SDK_VERSION as int + versionCode "git rev-list origin/master --count".execute().text.toInteger() + versionName VERSION_NAME + } - signingConfigs { - release { - storeFile file(keyStoreProperty) - keyAlias keyAliasProperty - storePassword keyStorePasswordProperty - keyPassword keyAliasPasswordProperty - } + signingConfigs { + release { + storeFile file(keyStoreProperty) + keyAlias keyAliasProperty + storePassword keyStorePasswordProperty + keyPassword keyAliasPasswordProperty } + } - buildTypes { - debug { - debuggable true - zipAlignEnabled true - } - release { - debuggable false - zipAlignEnabled true - signingConfig signingConfigs.release - } + buildTypes { + debug { + debuggable true + zipAlignEnabled true } + release { + debuggable false + zipAlignEnabled true + signingConfig signingConfigs.release + } + } } def getKeyStoreProperty() { - return hasProperty('WASABEEF_KEYSTORE') ? WASABEEF_KEYSTORE : "debug.keystore" + return hasProperty('WASABEEF_KEYSTORE') ? WASABEEF_KEYSTORE : "debug.keystore" } def getKeyAliasProperty() { - return hasProperty('WASABEEF_KEYALIAS') ? WASABEEF_KEYALIAS : "android" + return hasProperty('WASABEEF_KEYALIAS') ? WASABEEF_KEYALIAS : "android" } def getKeyStorePasswordProperty() { - return hasProperty('WASABEEF_KEYSTOREPASSWORD') ? WASABEEF_KEYSTOREPASSWORD : "androiddebugkey" + return hasProperty('WASABEEF_KEYSTOREPASSWORD') ? WASABEEF_KEYSTOREPASSWORD : "androiddebugkey" } def getKeyAliasPasswordProperty() { - return hasProperty('WASABEEF_KEYALIASPASSWORD') ? WASABEEF_KEYALIASPASSWORD : "android" + return hasProperty('WASABEEF_KEYALIASPASSWORD') ? WASABEEF_KEYALIASPASSWORD : "android" } dependencies { - compile project(':transformations') - compile "com.github.bumptech.glide:glide:${GLIDE_VERSION}" - compile "jp.co.cyberagent.android.gpuimage:gpuimage-library:${GPUIMAGE_VERSION}" - compile "com.android.support:appcompat-v7:${SUPPORT_PACKAGE_VERSION}" - compile "com.android.support:recyclerview-v7:${SUPPORT_PACKAGE_VERSION}" + compile project(':transformations') + compile "com.github.bumptech.glide:glide:${GLIDE_VERSION}" + compile "jp.co.cyberagent.android.gpuimage:gpuimage-library:${GPUIMAGE_VERSION}" + compile "com.android.support:appcompat-v7:${SUPPORT_PACKAGE_VERSION}" + compile "com.android.support:recyclerview-v7:${SUPPORT_PACKAGE_VERSION}" } From f6540b111fa249bcfad2284385c22b8a9a9c658f Mon Sep 17 00:00:00 2001 From: wasabeef Date: Thu, 21 Apr 2016 15:22:46 +0900 Subject: [PATCH 3/6] bump up 2.0.1 --- CHANGELOG.md | 7 +++++++ README.md | 2 +- gradle.properties | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb49272..27a355a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Change Log ========== +Version 2.0.1 *(2016-04-21)* +---------------------------- + +Fix: + [#35](https://github.com/wasabeef/glide-transformations/issues/35) + RSInvalidStateException + Version 2.0.0 *(2016-03-02)* ---------------------------- diff --git a/README.md b/README.md index 8e65c8e..6be9bb9 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ repositories { } dependencies { - compile 'jp.wasabeef:glide-transformations:2.0.0' + compile 'jp.wasabeef:glide-transformations:2.0.1' // If you want to use the GPU Filters compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.3.0' } diff --git a/gradle.properties b/gradle.properties index 523c37c..878c927 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=2.0.0 +VERSION_NAME=2.0.1 GROUP=jp.wasabeef ARTIFACT_ID=glide-transformations @@ -21,6 +21,6 @@ POM_DEVELOPER_EMAIL=dadadada.chop@gmail.com POM_DEVELOPER_URL=wasabeef.jp ISSUE_URL=https://github.com/wasabeef/glide-transformations/issues -SUPPORT_PACKAGE_VERSION=23.1.1 +SUPPORT_PACKAGE_VERSION=23.2.1 GLIDE_VERSION=3.7.0 GPUIMAGE_VERSION=1.3.0 \ No newline at end of file From 592815a6a0ef129d2216ad415caa2bf802267732 Mon Sep 17 00:00:00 2001 From: wasabeef Date: Thu, 21 Apr 2016 15:22:58 +0900 Subject: [PATCH 4/6] update gradle --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 71249c9..eccf45d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0-beta6' + classpath 'com.android.tools.build:gradle:2.0.0' classpath 'com.novoda:bintray-release:0.3.4' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2aadce4..c27087b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip From f9bca8887d51ae290b5b692495929e5992708886 Mon Sep 17 00:00:00 2001 From: wasabeef Date: Thu, 21 Apr 2016 15:23:22 +0900 Subject: [PATCH 5/6] fix bugs issue #35 --- .../jp/wasabeef/glide/transformations/BlurTransformation.java | 2 +- .../jp/wasabeef/glide/transformations/internal/RSBlur.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java index 3e96989..ad5ae1d 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java @@ -88,7 +88,7 @@ public class BlurTransformation implements Transformation { paint.setFlags(Paint.FILTER_BITMAP_FLAG); canvas.drawBitmap(source, 0, 0, paint); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { try { bitmap = RSBlur.blur(mContext, bitmap, mRadius); } catch (RSRuntimeException e) { diff --git a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java index f8617b0..6279152 100644 --- a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java +++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java @@ -28,11 +28,12 @@ import android.renderscript.ScriptIntrinsicBlur; public class RSBlur { - @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) + @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2) public static Bitmap blur(Context context, Bitmap bitmap, int radius) throws RSRuntimeException { RenderScript rs = null; try { rs = RenderScript.create(context); + rs.setMessageHandler(new RenderScript.RSMessageHandler()); Allocation input = Allocation.createFromBitmap(rs, bitmap, Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); From ddd76d4f06fbe0aed68686076230a61f40542cf8 Mon Sep 17 00:00:00 2001 From: wasabeef Date: Thu, 21 Apr 2016 15:27:26 +0900 Subject: [PATCH 6/6] fix layout --- example/src/main/res/layout/layout_list_item.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/src/main/res/layout/layout_list_item.xml b/example/src/main/res/layout/layout_list_item.xml index 23549a7..8e6f497 100644 --- a/example/src/main/res/layout/layout_list_item.xml +++ b/example/src/main/res/layout/layout_list_item.xml @@ -1,7 +1,7 @@