bump up 1.4.0

Author: wasabeef

.travis.yml

@@ -1,6 +1,14 @@
 Change Log
 ==========
 
+Version 1.4.0 *(2016-02-28)*
+----------------------------
+
+* added GPUImageHalftoneFilter (by @ryohey)
+* added GPUImageTransformFilter (by @jonan)
+* fixed GPUImageChromaKeyBlendFilter (by @badjano)
+* fixed GPUImageLookupFilter (by @jonan)
+
 Version 1.3.0 *(2015-09-04)*
 ----------------------------
 

CHANGELOG.md

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
     }
 }
 

build.gradle

@@ -1,10 +1,10 @@
-VERSION_NAME=1.3.0
+VERSION_NAME=1.4.0
 VERSION_CODE=9
 GROUP=jp.co.cyberagent.android.gpuimage
 
-COMPILE_SDK_VERSION=22
-BUILD_TOOLS_VERSION=22.0.1
-TARGET_SDK_VERSION=22
+COMPILE_SDK_VERSION=23
+BUILD_TOOLS_VERSION=23.0.2
+TARGET_SDK_VERSION=23
 MIN_SDK_VERSION=8
 
 POM_DESCRIPTION=Image filters for Android with OpenGL (based on GPUImage for iOS)
@@ -17,3 +17,5 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=pboos
 POM_DEVELOPER_NAME=Patrick Boos
+
+android.useDeprecatedNdk=true

gradle.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.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -35,5 +35,5 @@ repositories {
 dependencies {
     compile project(':library')
 //    compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:+@aar'
-    compile 'com.android.support:support-v4:21.+'
+    compile 'com.android.support:support-v4:23.1.1'
 }

sample/build.gradle

@@ -16,39 +16,56 @@
 
 package jp.co.cyberagent.android.gpuimage.sample.activity;
 
-import jp.co.cyberagent.android.gpuimage.sample.R;
+import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.PermissionChecker;
 import android.view.View;
 import android.view.View.OnClickListener;
+import jp.co.cyberagent.android.gpuimage.sample.R;
 
 public class ActivityMain extends Activity implements OnClickListener {
 
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
+    @Override public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         findViewById(R.id.button_gallery).setOnClickListener(this);
         findViewById(R.id.button_camera).setOnClickListener(this);
     }
 
-    @Override
-    public void onClick(final View v) {
-        switch (v.getId()) {
+    @Override public void onClick(final View v) {
+        if (PermissionChecker.checkSelfPermission(this, Manifest.permission.CAMERA)
+            == PackageManager.PERMISSION_DENIED) {
+            ActivityCompat.requestPermissions(this, new String[] { Manifest.permission.CAMERA },
+                v.getId());
+        } else {
+            startActivity(v.getId());
+        }
+    }
+
+    @Override public void onRequestPermissionsResult(int requestCode, String[] permissions,
+        int[] grantResults) {
+        if (grantResults.length != 1 || grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            startActivity(requestCode);
+        } else {
+            super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        }
+    }
+
+    private void startActivity(int id) {
+        switch (id) {
             case R.id.button_gallery:
-                startActivity(ActivityGallery.class);
+                startActivity(new Intent(this, ActivityGallery.class));
                 break;
             case R.id.button_camera:
-                startActivity(ActivityCamera.class);
+                startActivity(new Intent(this, ActivityCamera.class));
                 break;
 
             default:
                 break;
         }
     }
-
-    private void startActivity(final Class<?> activityClass) {
-        startActivity(new Intent(this, activityClass));
-    }
 }