Skip to content

Commit 34cc92f

Browse files
wasabeefwasabeef
authored
Merge pull request wasabeef#66 from wasabeef/dev
2.0.2
2 parents 45c2e3b + 5715d7a commit 34cc92f

29 files changed

+50
-56
lines changed

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
Change Log
22
==========
33

4+
Version 2.0.2 *(2017-03-17)*
5+
----------------------------
6+
7+
Update:
8+
- Compile & Target SDK Version 23 -> 25
9+
- Build Tools 23.0.2 -> 25.0.2
10+
- Support Library 23.2.1 -> 25.3.0
11+
- GPUImage for Android 1.3.0 -> 1.4.1
12+
13+
Bug Fix:
14+
- [Additional resource cleanup in RSBlur #45](https://github.com/wasabeef/glide-transformations/pull/45)
15+
416
Version 2.0.1 *(2016-04-21)*
517
----------------------------
618

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ repositories {
3333
}
3434
3535
dependencies {
36-
compile 'jp.wasabeef:glide-transformations:2.0.1'
36+
compile 'jp.wasabeef:glide-transformations:2.0.2'
3737
// If you want to use the GPU Filters
38-
compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.3.0'
38+
compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.4.1'
3939
}
4040
```
4141

@@ -119,7 +119,7 @@ Thanks
119119
License
120120
-------
121121

122-
Copyright 2015 Wasabeef
122+
Copyright 2017 Wasabeef
123123

124124
Licensed under the Apache License, Version 2.0 (the "License");
125125
you may not use this file except in compliance with the License.

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.0.0'
8+
classpath 'com.android.tools.build:gradle:2.3.0'
99
classpath 'com.novoda:bintray-release:0.3.4'
1010
}
1111
}

‎example/src/main/java/jp/wasabeef/example/glide/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.example.glide;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
VERSION_NAME=2.0.1
1+
VERSION_NAME=2.0.2
22
GROUP=jp.wasabeef
33
ARTIFACT_ID=glide-transformations
44

5-
COMPILE_SDK_VERSION=23
6-
BUILD_TOOLS_VERSION=23.0.2
7-
TARGET_SDK_VERSION=23
5+
COMPILE_SDK_VERSION=25
6+
BUILD_TOOLS_VERSION=25.0.2
7+
TARGET_SDK_VERSION=25
88
MIN_SDK_VERSION=11
99

1010
POM_DESCRIPTION=which provides simple Tranformations to Glide
@@ -21,6 +21,6 @@ [email protected]
2121
POM_DEVELOPER_URL=wasabeef.jp
2222
ISSUE_URL=https://github.com/wasabeef/glide-transformations/issues
2323

24-
SUPPORT_PACKAGE_VERSION=23.2.1
24+
SUPPORT_PACKAGE_VERSION=25.3.0
2525
GLIDE_VERSION=3.7.0
26-
GPUIMAGE_VERSION=1.3.0
26+
GPUIMAGE_VERSION=1.4.1

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Fri Mar 17 06:53:45 JST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
7-
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

‎transformations/build.gradle

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,14 @@ dependencies {
2020
provided "jp.co.cyberagent.android.gpuimage:gpuimage-library:${GPUIMAGE_VERSION}"
2121
}
2222

23-
task androidJavadocs(type: Javadoc) {
24-
source = android.sourceSets.main.java.srcDirs
25-
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
26-
}
27-
28-
task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
29-
classifier = 'javadoc'
30-
from androidJavadocs.destinationDir
31-
}
32-
33-
task androidSourcesJar(type: Jar) {
34-
classifier = 'sources'
35-
from android.sourceSets.main.java.srcDirs
36-
}
37-
38-
artifacts {
39-
archives androidSourcesJar
40-
archives androidJavadocsJar
41-
}
42-
4323
publish {
4424
userOrg = POM_DEVELOPER_ID
4525
groupId = GROUP
4626
artifactId = ARTIFACT_ID
4727
publishVersion = VERSION_NAME
4828
desc = POM_DESCRIPTION
4929
website = POM_URL
30+
bintrayUser = BINTRAY_USER
31+
bintrayKey = BINTRAY_API_KEY
32+
autoPublish = false
5033
}

‎transformations/src/main/java/jp/wasabeef/glide/transformations/BlurTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/ColorFilterTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/CropCircleTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/CropSquareTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/CropTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/GrayscaleTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/MaskTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/RoundedCornersTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/BrightnessFilterTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations.gpu;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ContrastFilterTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations.gpu;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/GPUFilterTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations.gpu;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/InvertFilterTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations.gpu;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/KuwaharaFilterTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations.gpu;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/PixelationFilterTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations.gpu;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SepiaFilterTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations.gpu;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SketchFilterTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations.gpu;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/SwirlFilterTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations.gpu;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/ToonFilterTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations.gpu;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/gpu/VignetteFilterTransformation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jp.wasabeef.glide.transformations.gpu;
22

33
/**
4-
* Copyright (C) 2015 Wasabeef
4+
* Copyright (C) 2017 Wasabeef
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/internal/FastBlur.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.graphics.Bitmap;
44

55
/**
6-
* Copyright (C) 2015 Wasabeef
6+
* Copyright (C) 2017 Wasabeef
77
*
88
* Licensed under the Apache License, Version 2.0 (the "License");
99
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/internal/RSBlur.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import android.renderscript.ScriptIntrinsicBlur;
1212

1313
/**
14-
* Copyright (C) 2015 Wasabeef
14+
* Copyright (C) 2017 Wasabeef
1515
*
1616
* Licensed under the Apache License, Version 2.0 (the "License");
1717
* you may not use this file except in compliance with the License.

‎transformations/src/main/java/jp/wasabeef/glide/transformations/internal/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import android.os.Build;
66

77
/**
8-
* Copyright (C) 2015 Wasabeef
8+
* Copyright (C) 2017 Wasabeef
99
*
1010
* Licensed under the Apache License, Version 2.0 (the "License");
1111
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)