From 1ec073893e256f61ebef65f06b31b8690a2d4273 Mon Sep 17 00:00:00 2001 From: Mai Cervantes Date: Tue, 2 May 2017 11:24:54 +0800 Subject: [PATCH 1/6] project/build.gradle - updated build tools version --- FFmpegAndroid/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/FFmpegAndroid/build.gradle b/FFmpegAndroid/build.gradle index c6178c7..7a99208 100644 --- a/FFmpegAndroid/build.gradle +++ b/FFmpegAndroid/build.gradle @@ -28,6 +28,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + buildToolsVersion '25.0.0' } dependencies { From 0ec04d89dc738c7175cfa15afede4485e1b0607b Mon Sep 17 00:00:00 2001 From: Mai Cervantes Date: Tue, 2 May 2017 11:26:18 +0800 Subject: [PATCH 2/6] build.gradle - updated cradle and maven dependencies --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 939b683..fa8b213 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0-beta3' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' + classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1" // NOTE: Do not place your application dependencies here; they belong From d46cd5ad449af4b5072d00f240415aa2219c76d2 Mon Sep 17 00:00:00 2001 From: Mai Cervantes Date: Tue, 2 May 2017 11:26:39 +0800 Subject: [PATCH 3/6] app/build.gradle - updated build tools version --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index f6d48ab..0090a32 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,6 +28,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + buildToolsVersion '25.0.0' } dependencies { From 3b0fb81810155c412d9b69780841a214775eafa0 Mon Sep 17 00:00:00 2001 From: Mai Cervantes Date: Tue, 2 May 2017 11:27:01 +0800 Subject: [PATCH 4/6] gradle-wrapper.properties - updated cradle distribution version being used --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5acddb1..3d4091e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 20 11:52:28 GMT+05:30 2016 +#Tue May 02 00:13:58 PHT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip From 55c8152dad94f5a12612d4c65dd85bbfcc45a581 Mon Sep 17 00:00:00 2001 From: Mai Cervantes Date: Tue, 2 May 2017 11:27:42 +0800 Subject: [PATCH 5/6] Util.java - fixed call that modifies application properties when determining if app is running in debug mode --- .../src/main/java/com/github/hiteshsondhi88/libffmpeg/Util.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Util.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Util.java index 378a863..d695c47 100644 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Util.java +++ b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Util.java @@ -13,7 +13,7 @@ class Util { static boolean isDebug(Context context) { - return (0 != (context.getApplicationContext().getApplicationInfo().flags &= ApplicationInfo.FLAG_DEBUGGABLE)); + return (0 != (context.getApplicationContext().getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)); } static void close(InputStream inputStream) { From 6f6b19dad78e97ccc76d7eff5eec3c18057bbbba Mon Sep 17 00:00:00 2001 From: Mai Cervantes Date: Tue, 2 May 2017 11:29:21 +0800 Subject: [PATCH 6/6] build.gradle - bumped up version number and version code --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index fa8b213..78eb351 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,6 @@ ext { buildToolsVersion = '22.0.1' targetSdkVersion = 22 minSdkVersion = 16 - versionCode = 28 - versionName = "0.3.2" + versionCode = 29 + versionName = "0.3.2.1" }