Merge pull request #54 from wasabeef/dev

2.1.1

CHANGELOG.md

@@ -1,6 +1,16 @@
 Change Log
 ==========
 
+Version 2.1.1 *(2017-03-21)*
+----------------------------
+
+Update:
+- Support Library 24.2.0 -> 25.3.0
+
+Bug Fix:
+- [Destroy Allocation and ScriptInstrinsicBlur objects to prevent memory leaks #51](https://github.com/wasabeef/Blurry/pull/51)
+
+
 Version 2.1.0 *(2016-12-20)*
 ----------------------------
 
@@ -12,7 +22,6 @@ PR:
 - [#44](https://github.com/wasabeef/Blurry/pull/44) Implement BitmapComposer
 
 
-
 Version 2.0.3 *(2016-08-04)*
 ----------------------------
 

README.md

@@ -19,7 +19,7 @@ How do I use it?
 ##### Dependencies
 ```groovy
 dependencies {
-    compile 'jp.wasabeef:blurry:2.1.0'
+    compile 'jp.wasabeef:blurry:2.1.1'
 }
 ```
 
@@ -78,7 +78,7 @@ src="https://raw.githubusercontent.com/wasabeef/art/master/twitter.png" width="7
 License
 -------
 
-    Copyright 2015 Wasabeef
+    Copyright 2017 Wasabeef
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

blurry/build.gradle

@@ -15,31 +15,14 @@ android {
   }
 }
 
-task androidJavadocs(type: Javadoc) {
-  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
-}
-
-task androidSourcesJar(type: Jar) {
-  classifier = 'sources'
-  from android.sourceSets.main.java.srcDirs
-}
-
-artifacts {
-  archives androidSourcesJar
-  archives androidJavadocsJar
-}
-
 publish {
   userOrg = POM_DEVELOPER_ID
   groupId = GROUP
   artifactId = ARTIFACT_ID
   publishVersion = VERSION_NAME
   desc = POM_DESCRIPTION
   website = POM_URL
+  bintrayUser = BINTRAY_USER
+  bintrayKey = BINTRAY_API_KEY
+  autoPublish = false
 }

blurry/src/main/java/jp/wasabeef/blurry/Blurry.java

@@ -14,7 +14,7 @@
 import jp.wasabeef.blurry.internal.Helper;
 
 /**
- * Copyright (C) 2015 Wasabeef
+ * Copyright (C) 2017 Wasabeef
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

blurry/src/main/java/jp/wasabeef/blurry/internal/Blur.java

@@ -16,7 +16,7 @@
 import android.view.View;
 
 /**
- * Copyright (C) 2015 Wasabeef
+ * Copyright (C) 2017 Wasabeef
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@ public static Bitmap of(Context context, Bitmap source, BlurFactor factor) {
   }
 
   @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
-  public static Bitmap rs(Context context, Bitmap bitmap, int radius) throws RSRuntimeException {
+  private static Bitmap rs(Context context, Bitmap bitmap, int radius) throws RSRuntimeException {
     RenderScript rs = null;
     Allocation input = null;
     Allocation output = null;
@@ -91,7 +91,7 @@ public static Bitmap rs(Context context, Bitmap bitmap, int radius) throws RSRun
       rs = RenderScript.create(context);
       rs.setMessageHandler(new RenderScript.RSMessageHandler());
       input = Allocation.createFromBitmap(rs, bitmap, Allocation.MipmapControl.MIPMAP_NONE,
-              Allocation.USAGE_SCRIPT);
+          Allocation.USAGE_SCRIPT);
       output = Allocation.createTyped(rs, input.getType());
       blur = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs));
 
@@ -117,7 +117,7 @@ public static Bitmap rs(Context context, Bitmap bitmap, int radius) throws RSRun
     return bitmap;
   }
 
-  public static Bitmap stack(Bitmap sentBitmap, int radius, boolean canReuseInBitmap) {
+  private static Bitmap stack(Bitmap sentBitmap, int radius, boolean canReuseInBitmap) {
 
     // Stack Blur v1.0 from
     // http://www.quasimondo.com/StackBlurForCanvas/StackBlurDemo.html

blurry/src/main/java/jp/wasabeef/blurry/internal/BlurFactor.java

@@ -3,7 +3,7 @@
 import android.graphics.Color;
 
 /**
- * Copyright (C) 2015 Wasabeef
+ * Copyright (C) 2017 Wasabeef
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

blurry/src/main/java/jp/wasabeef/blurry/internal/BlurTask.java

@@ -12,7 +12,7 @@
 import java.util.concurrent.Executors;
 
 /**
- * Copyright (C) 2015 Wasabeef
+ * Copyright (C) 2017 Wasabeef
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

blurry/src/main/java/jp/wasabeef/blurry/internal/Helper.java

@@ -6,7 +6,7 @@
 import android.view.animation.AlphaAnimation;
 
 /**
- * Copyright (C) 2015 Wasabeef
+ * Copyright (C) 2017 Wasabeef
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.novoda:bintray-release:0.3.4'
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=2.1.0
+VERSION_NAME=2.1.1
 GROUP=jp.wasabeef
 ARTIFACT_ID=blurry
 
@@ -21,4 +21,4 @@ POM_DEVELOPER_EMAIL=dadadada.chop@gmail.com
 POM_DEVELOPER_URL=wasabeef.jp
 ISSUE_URL=https://github.com/wasabeef/Blurry/issues
 
-SUPPORT_PACKAGE_VERSION=24.2.0
+SUPPORT_PACKAGE_VERSION=25.3.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Dec 20 17:43:40 JST 2016
+#Tue Mar 21 13:38:59 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line