diff --git a/FFmpegAndroid/assets/armeabi-v7a/ffmpeg b/FFmpegAndroid/assets/armeabi-v7a/ffmpeg index 036bf6f..ec8c1d0 100644 Binary files a/FFmpegAndroid/assets/armeabi-v7a/ffmpeg and b/FFmpegAndroid/assets/armeabi-v7a/ffmpeg differ diff --git a/FFmpegAndroid/assets/x86/ffmpeg b/FFmpegAndroid/assets/x86/ffmpeg index b9fbba9..e6932d9 100644 Binary files a/FFmpegAndroid/assets/x86/ffmpeg and b/FFmpegAndroid/assets/x86/ffmpeg differ diff --git a/FFmpegAndroid/build.gradle b/FFmpegAndroid/build.gradle index c6178c7..77e6b4a 100644 --- a/FFmpegAndroid/build.gradle +++ b/FFmpegAndroid/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' apply plugin: "com.jfrog.bintray" // This is the library version used when deploying the artifact @@ -28,6 +27,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + buildToolsVersion '27.0.3' } dependencies { @@ -37,43 +37,43 @@ dependencies { } group = GROUP - -install { - repositories.mavenInstaller { - // This generates POM.xml with proper parameters - pom { - project { - packaging POM_PACKAGING - - // Add your description here - name 'FFmpeg Android' - description = POM_DESCRIPTION - url POM_URL - - // Set your license - licenses { - license { - name POM_LICENCE_NAME - url POM_LICENCE_URL - } - } - developers { - developer { - id POM_DEVELOPER_ID - name POM_DEVELOPER_NAME - email 'hitesh@writingminds.com' - } - } - scm { - connection POM_SCM_URL - developerConnection POM_SCM_URL - url POM_URL - - } - } - } - } -} +// +//install { +// repositories.mavenInstaller { +// // This generates POM.xml with proper parameters +// pom { +// project { +// packaging POM_PACKAGING +// +// // Add your description here +// name 'FFmpeg Android' +// description = POM_DESCRIPTION +// url POM_URL +// +// // Set your license +// licenses { +// license { +// name POM_LICENCE_NAME +// url POM_LICENCE_URL +// } +// } +// developers { +// developer { +// id POM_DEVELOPER_ID +// name POM_DEVELOPER_NAME +// email 'hitesh@writingminds.com' +// } +// } +// scm { +// connection POM_SCM_URL +// developerConnection POM_SCM_URL +// url POM_URL +// +// } +// } +// } +// } +//} task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs diff --git a/app/assets/ffmpeg b/app/assets/ffmpeg new file mode 100755 index 0000000..a9fc54c Binary files /dev/null and b/app/assets/ffmpeg differ diff --git a/app/build.gradle b/app/build.gradle index f6d48ab..b070e75 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,12 +29,15 @@ android { } } } +android.defaultConfig.javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true dependencies { compile 'com.squareup.dagger:dagger-compiler:1.2.2' compile 'com.squareup.dagger:dagger:1.2.2' compile 'com.jakewharton:butterknife:5.1.2' - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') androidTestCompile 'com.squareup.assertj:assertj-android:1.0.0' compile project(':FFmpegAndroid') + implementation 'com.android.support:support-v13:27.1.0' + implementation 'com.android.support:design:27.1.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7a7ba8d..6c1b111 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ package="com.github.hiteshsondhi88.sampleffmpeg" > +