Skip to content

Commit e19b421

Browse files
committed
bump up 1.4.1
1 parent e5ae70b commit e19b421

14 files changed

+66
-277
lines changed

.gitignore

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
1-
#OSX
21
.DS_Store
3-
target/
2+
Thumbs.db
3+
4+
# gradle files
5+
.gradle
46

5-
.idea/
7+
# Intellij project files
8+
.idea
69
*.iml
710

8-
#Gradle
11+
# generated files
12+
bin/
13+
gen/
14+
obj/
15+
apk/
16+
target/
917
build/
10-
.gradle/
18+
19+
# Local configuration file (sdk path, etc)
1120
local.properties
21+
22+
# Proguard folder generated by Eclipse
23+
proguard/

.travis.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

CHANGELOG.md

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

4+
Version 1.4.1 *(2016-03-15)*
5+
----------------------------
6+
7+
Using Bintray's JCenter.
8+
9+
410
Version 1.4.0 *(2016-02-28)*
511
----------------------------
612

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# GPUImage for Android
2+
[![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
3+
[![Download](https://api.bintray.com/packages/cyberagent/maven/gpuimage-library/images/download.svg) ](https://bintray.com/cyberagent/maven/gpuimage-library/_latestVersion)
24

35
Idea from: [iOS GPUImage framework](https://github.com/BradLarson/GPUImage)
46

@@ -13,11 +15,11 @@ Goal is to have something as similar to GPUImage as possible. Vertex and fragmen
1315

1416
```groovy
1517
repositories {
16-
mavenCentral()
18+
jcenter()
1719
}
1820
1921
dependencies {
20-
compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.3.0'
22+
compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.4.1'
2123
}
2224
```
2325

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ buildscript {
66
}
77
dependencies {
88
classpath 'com.android.tools.build:gradle:2.0.0-beta6'
9+
classpath 'com.novoda:bintray-release:0.3.4'
910
}
1011
}
1112

gradle.properties

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
VERSION_NAME=1.4.0
2-
VERSION_CODE=9
1+
VERSION_NAME=1.4.1
32
GROUP=jp.co.cyberagent.android.gpuimage
3+
ARTIFACT_ID=gpuimage-library
44

55
COMPILE_SDK_VERSION=23
66
BUILD_TOOLS_VERSION=23.0.2
@@ -15,7 +15,8 @@ POM_SCM_DEV_CONNECTION=scm:[email protected]:CyberAgent/android-gpuimage.git
1515
POM_LICENCE_NAME=The Apache Software License, Version 2.0
1616
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
1717
POM_LICENCE_DIST=repo
18-
POM_DEVELOPER_ID=pboos
19-
POM_DEVELOPER_NAME=Patrick Boos
18+
POM_DEVELOPER_ID=cyberagent
19+
POM_DEVELOPER_NAME=CyberAgent, Inc.
20+
ISSUE_URL=https://github.com/CyberAgent/android-gpuimage/issues
2021

2122
android.useDeprecatedNdk=true

library/.gitignore

Lines changed: 0 additions & 32 deletions
This file was deleted.

library/android-artifacts.gradle

Lines changed: 0 additions & 24 deletions
This file was deleted.

library/build.gradle

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'com.android.library'
2+
apply plugin: 'com.novoda.bintray-release'
23

34
android {
45
compileSdkVersion COMPILE_SDK_VERSION as int
@@ -8,8 +9,10 @@ android {
89
minSdkVersion MIN_SDK_VERSION as int
910
targetSdkVersion TARGET_SDK_VERSION as int
1011

11-
versionCode = VERSION_CODE
12-
versionName = VERSION_NAME
12+
versionCode "git rev-list origin/master --count".execute().text.toInteger()
13+
versionName VERSION_NAME
14+
15+
consumerProguardFiles 'proguard-rules.txt'
1316

1417
ndk {
1518
moduleName "gpuimage-library"
@@ -37,25 +40,33 @@ android {
3740
lintOptions {
3841
abortOnError false
3942
}
43+
}
4044

41-
android.libraryVariants.all { variant ->
42-
if (variant.buildType.isDebuggable()) {
43-
return; // Skip debug builds.
44-
}
45-
task("javadoc${variant.name.capitalize()}", type: Javadoc) {
46-
description "Generates Javadoc for $variant.name."
47-
source = variant.javaCompile.source
48-
ext.androidJar = System.getenv("ANDROID_HOME") + "/platforms/${android.compileSdkVersion}/android.jar"
49-
classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
50-
}
45+
task androidJavadocs(type: Javadoc) {
46+
source = android.sourceSets.main.java.srcDirs
47+
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
48+
}
5149

52-
task("bundleJavadoc${variant.name.capitalize()}", type: Jar) {
53-
description "Bundles Javadoc into zip for $variant.name."
54-
classifier = "javadoc"
55-
from tasks["javadoc${variant.name.capitalize()}"]
56-
}
57-
}
50+
task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
51+
classifier = 'javadoc'
52+
from androidJavadocs.destinationDir
53+
}
54+
55+
task androidSourcesJar(type: Jar) {
56+
classifier = 'sources'
57+
from android.sourceSets.main.java.srcDirs
5858
}
5959

60-
apply from: 'android-artifacts.gradle'
61-
apply from: 'central-publish.gradle'
60+
artifacts {
61+
archives androidSourcesJar
62+
archives androidJavadocsJar
63+
}
64+
65+
publish {
66+
userOrg = POM_DEVELOPER_ID
67+
groupId = GROUP
68+
artifactId = ARTIFACT_ID
69+
publishVersion = VERSION_NAME
70+
desc = POM_DESCRIPTION
71+
website = POM_URL
72+
}

library/central-publish.gradle

Lines changed: 0 additions & 94 deletions
This file was deleted.

library/proguard-project.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

library/proguard-rules.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-dontwarn jp.co.cyberagent.android.gpuimage.**

0 commit comments

Comments
 (0)