diff --git a/CHANGELOG.md b/CHANGELOG.md index 2940b14..cd4e8a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ Change Log ========== +Version 1.3.1 *(2015-11-27)* +---------------------------- + +Change the renderscriptTargetApi down to 20. + Warning:Renderscript support mode is not currently supported with renderscript target 21+ + +fix: memory leak. + Version 1.3.0 *(2015-11-10)* ---------------------------- diff --git a/README.md b/README.md index bc9c638..3584b28 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ repositories { } dependencies { - compile 'jp.wasabeef:glide-transformations:1.3.0' + compile 'jp.wasabeef:glide-transformations:1.3.1' // If you want to use the GPU Filters compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.3.0' } diff --git a/build.gradle b/build.gradle index 66e635c..1c6b81d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0-beta2' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.3.1' + classpath 'com.android.tools.build:gradle:2.0.0-alpha1' + classpath 'com.novoda:bintray-release:0.3.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/example/build.gradle b/example/build.gradle index eca4cc8..baeeb35 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { minSdkVersion MIN_SDK_VERSION as int targetSdkVersion TARGET_SDK_VERSION as int - versionCode VERSION_CODE as int + versionCode "git rev-list origin/master --count".execute().text.toInteger() versionName VERSION_NAME // Warning:Renderscript support mode is not currently supported with renderscript target 21+ diff --git a/gradle.properties b/gradle.properties index 55baf38..533c754 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ -VERSION_NAME=1.3.0 -VERSION_CODE=13 +VERSION_NAME=1.3.1 GROUP=jp.wasabeef ARTIFACT_ID=glide-transformations COMPILE_SDK_VERSION=23 BUILD_TOOLS_VERSION=23.0.2 TARGET_SDK_VERSION=23 +# Warning:Renderscript support mode is not currently supported with renderscript target 21+ RENDERSCRIPT_TARGET_API=20 MIN_SDK_VERSION=11 @@ -23,6 +23,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.0.1 +SUPPORT_PACKAGE_VERSION=23.1.1 GLIDE_VERSION=3.6.1 GPUIMAGE_VERSION=1.3.0 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e7faee0..07fc193 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip diff --git a/transformations/android-artifacts.gradle b/transformations/android-artifacts.gradle deleted file mode 100644 index bc64f23..0000000 --- a/transformations/android-artifacts.gradle +++ /dev/null @@ -1,25 +0,0 @@ -task androidJavadocs(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar" - classpath += files(ext.androidJar) -} - -task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { - classifier = 'javadoc' - from androidJavadocs.destinationDir -} - -task androidSourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.sourceFiles -} - -task androidJar(type: Jar) { - from 'build/intermediates/classes/release' -} - -artifacts { - archives androidSourcesJar - archives androidJavadocsJar - archives androidJar -} \ No newline at end of file diff --git a/transformations/bintray-publish.gradle b/transformations/bintray-publish.gradle deleted file mode 100644 index 366f65f..0000000 --- a/transformations/bintray-publish.gradle +++ /dev/null @@ -1,64 +0,0 @@ -apply plugin: 'maven-publish' -apply plugin: 'com.jfrog.bintray' - -publishing { - publications { - mavenJava(MavenPublication) { - groupId GROUP - version VERSION_NAME - artifactId ARTIFACT_ID -// artifact androidJar - artifact "build/outputs/aar/transformations-release.aar" - artifact androidJavadocsJar - artifact androidSourcesJar - pom.withXml { - Node root = asNode() - root.appendNode('name', ARTIFACT_ID) - root.appendNode('description', POM_DESCRIPTION) - root.appendNode('url', POM_URL) - - def issues = root.appendNode('issueManagement') - issues.appendNode('system', 'github') - issues.appendNode('url', ISSUE_URL) - - def scm = root.appendNode('scm') - scm.appendNode('url', POM_SCM_URL) - scm.appendNode('connection', POM_SCM_CONNECTION) - scm.appendNode('developerConnection', POM_SCM_DEV_CONNECTION) - - def license = root.appendNode('licenses').appendNode('license') - license.appendNode('name', POM_LICENCE_NAME) - license.appendNode('url', POM_LICENCE_URL) - license.appendNode('distribution', POM_LICENCE_DIST) - } - } - } -} - -def getBintrayUserProperty() { - return hasProperty('bintrayUser') ? bintrayUser : "" -} - -def getBintrayApiKeyProperty() { - return hasProperty('bintrayApiKey') ? bintrayApiKey : "" -} - -bintray { - user = bintrayUserProperty - key = bintrayApiKeyProperty - publications = ['mavenJava'] - - dryRun = false - publish = false - pkg { - repo = 'maven' - name = ARTIFACT_ID - licenses = ['Apache-2.0'] - labels = ['android'] - - version { - name = VERSION_NAME - vcsTag = VERSION_NAME - } - } -} diff --git a/transformations/build.gradle b/transformations/build.gradle index f430faf..3dddb8c 100644 --- a/transformations/build.gradle +++ b/transformations/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.library' +apply plugin: 'com.novoda.bintray-release' android { compileSdkVersion COMPILE_SDK_VERSION as int @@ -7,7 +8,7 @@ android { defaultConfig { minSdkVersion MIN_SDK_VERSION as int targetSdkVersion TARGET_SDK_VERSION as int - versionCode VERSION_CODE as int + versionCode "git rev-list origin/master --count".execute().text.toInteger() versionName VERSION_NAME // Warning:Renderscript support mode is not currently supported with renderscript target 21+ @@ -21,24 +22,11 @@ dependencies { provided "jp.co.cyberagent.android.gpuimage:gpuimage-library:${GPUIMAGE_VERSION}" } -android.libraryVariants.all { variant -> - if (variant.buildType.isDebuggable()) { - return; // Skip debug builds. - } - task("javadoc${variant.name.capitalize()}", type: Javadoc) { - description "Generates Javadoc for $variant.name." - source = variant.javaCompile.source - ext.androidJar = System.getenv("ANDROID_HOME") + "/platforms/${android.compileSdkVersion}/android.jar" - classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar) - } - - task("bundleJavadoc${variant.name.capitalize()}", type: Jar) { - description "Bundles Javadoc into zip for $variant.name." - classifier = "javadoc" - from tasks["javadoc${variant.name.capitalize()}"] - } +publish { + userOrg = POM_DEVELOPER_ID + groupId = GROUP + artifactId = ARTIFACT_ID + publishVersion = VERSION_NAME + desc = POM_DESCRIPTION + website = POM_URL } - -apply from: 'android-artifacts.gradle' -apply from: 'central-publish.gradle' -apply from: 'bintray-publish.gradle' diff --git a/transformations/central-publish.gradle b/transformations/central-publish.gradle deleted file mode 100644 index 4575f08..0000000 --- a/transformations/central-publish.gradle +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright 2013 Chris Banes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'maven' -apply plugin: 'signing' - -def isReleaseBuild() { - return VERSION_NAME.contains("SNAPSHOT") == false -} - -def getReleaseRepositoryUrl() { - return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL - : "https://oss.sonatype.org/service/local/staging/deploy/maven2/" -} - -def getSnapshotRepositoryUrl() { - return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL - : "https://oss.sonatype.org/content/repositories/snapshots/" -} - -def getRepositoryUsername() { - return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "" -} - -def getRepositoryPassword() { - return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "" -} - -afterEvaluate { project -> - uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - pom.groupId = GROUP - pom.artifactId = POM_ARTIFACT_ID - pom.version = VERSION_NAME - - repository(url: getReleaseRepositoryUrl()) { - authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) - } - snapshotRepository(url: getSnapshotRepositoryUrl()) { - authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) - } - - pom.project { - name POM_NAME - packaging POM_PACKAGING - description POM_DESCRIPTION - url POM_URL - - scm { - url POM_SCM_URL - connection POM_SCM_CONNECTION - developerConnection POM_SCM_DEV_CONNECTION - } - - licenses { - license { - name POM_LICENCE_NAME - url POM_LICENCE_URL - distribution POM_LICENCE_DIST - } - } - - developers { - developer { - id POM_DEVELOPER_ID - name POM_DEVELOPER_NAME - } - } - } - } - } - } - - signing { - required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } - sign configurations.archives - } -} \ No newline at end of file diff --git a/transformations/gradle.properties b/transformations/gradle.properties deleted file mode 100644 index 92ca31b..0000000 --- a/transformations/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -POM_NAME=which provides simple Tranformations to Glide -POM_ARTIFACT_ID=glide-transformations -POM_PACKAGING=aar \ No newline at end of file