Merge pull request #66 from wasabeef/dev

2.0.2
2025-06-07 14:54:05 +08:00 · 2017-03-17 17:41:49 -07:00 · 2017-03-17 17:41:49 -07:00 · 34cc92f7a4
commit 34cc92f7a4
parent 45c2e3bcfe 5715d7a999
29 changed files with 50 additions and 56 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,18 @@
 Change Log
 ==========

+Version 2.0.2 *(2017-03-17)*
+----------------------------
+
+Update:
+- Compile & Target SDK Version 23 -> 25
+- Build Tools 23.0.2 -> 25.0.2
+- Support Library 23.2.1 -> 25.3.0
+- GPUImage for Android 1.3.0 -> 1.4.1
+
+Bug Fix:
+- [Additional resource cleanup in RSBlur #45](https://github.com/wasabeef/glide-transformations/pull/45)
+ 
 Version 2.0.1 *(2016-04-21)*
 ----------------------------

--- a/README.md
+++ b/README.md
@ -33,9 +33,9 @@ repositories {
 }

 dependencies {
-    compile 'jp.wasabeef:glide-transformations:2.0.1'
+    compile 'jp.wasabeef:glide-transformations:2.0.2'
    // If you want to use the GPU Filters
-    compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.3.0'
+    compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.4.1'
 }
 ```

@ -119,7 +119,7 @@ Thanks
 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.
--- a/build.gradle
+++ b/build.gradle
@ -5,7 +5,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.3.0'
        classpath 'com.novoda:bintray-release:0.3.4'
    }
 }
--- a/example/src/main/java/jp/wasabeef/example/glide/Utils.java
+++ b/example/src/main/java/jp/wasabeef/example/glide/Utils.java
@ -1,7 +1,7 @@
 package jp.wasabeef.example.glide;

 /**
- * 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.
--- a/gradle.properties
+++ b/gradle.properties
@ -1,10 +1,10 @@
-VERSION_NAME=2.0.1
+VERSION_NAME=2.0.2
 GROUP=jp.wasabeef
 ARTIFACT_ID=glide-transformations

-COMPILE_SDK_VERSION=23
-BUILD_TOOLS_VERSION=23.0.2
-TARGET_SDK_VERSION=23
+COMPILE_SDK_VERSION=25
+BUILD_TOOLS_VERSION=25.0.2
+TARGET_SDK_VERSION=25
 MIN_SDK_VERSION=11

 POM_DESCRIPTION=which provides simple Tranformations to Glide
@ -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.2.1
+SUPPORT_PACKAGE_VERSION=25.3.0
 GLIDE_VERSION=3.7.0
-GPUIMAGE_VERSION=1.3.0
+GPUIMAGE_VERSION=1.4.1
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,7 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Fri Mar 17 06:53:45 JST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
-
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
--- a/transformations/build.gradle
+++ b/transformations/build.gradle
@ -20,26 +20,6 @@ dependencies {
  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))
-}
-
-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
@ -47,4 +27,7 @@ publish {
  publishVersion = VERSION_NAME
  desc = POM_DESCRIPTION
  website = POM_URL
+  bintrayUser = BINTRAY_USER
+  bintrayKey = BINTRAY_API_KEY
+  autoPublish = false
 }
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/ColorFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/ColorFilterTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/CropTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/CropTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/GrayscaleTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/GrayscaleTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/MaskTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/MaskTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/BrightnessFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/BrightnessFilterTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations.gpu;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations.gpu;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/GPUFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/GPUFilterTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations.gpu;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/InvertFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/InvertFilterTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations.gpu;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations.gpu;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations.gpu;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations.gpu;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations.gpu;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations.gpu;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations.gpu;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java
@ -1,7 +1,7 @@
 package jp.wasabeef.glide.transformations.gpu;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/FastBlur.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/FastBlur.java
@ -3,7 +3,7 @@ package jp.wasabeef.glide.transformations.internal;
 import android.graphics.Bitmap;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java
@ -11,7 +11,7 @@ import android.renderscript.RenderScript;
 import android.renderscript.ScriptIntrinsicBlur;

 /**
- * 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.
--- a/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/Utils.java
+++ b/transformations/src/main/java/jp/wasabeef/glide/transformations/internal/Utils.java
@ -5,7 +5,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;

 /**
- * 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.