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 { 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) { 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 { diff --git a/build.gradle b/build.gradle index 939b683..78eb351 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 @@ -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" } 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