0.0.6

adrielcafe · adrielcafe · commit 6285c43cc42f · 2016-09-15T15:09:15.000-03:00
diff --git a/FFmpegAndroid/FFmpegAndroid.aar b/FFmpegAndroid/FFmpegAndroid.aar
diff --git a/FFmpegAndroid/build.gradle b/FFmpegAndroid/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('FFmpegAndroid.aar'))
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,7 +19,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':lib')
     compile 'com.android.support:appcompat-v7:24.2.0'
-}
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
     package="cafe.adriel.androidaudioconverter.sample">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,9 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.2.0-rc2'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
@@ -20,4 +15,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -9,7 +9,6 @@ android {
         targetSdkVersion 24
         versionCode 1
         versionName "1.0"
-
     }
     buildTypes {
         release {
@@ -20,5 +19,5 @@ android {
 }
 
 dependencies {
-    compile 'com.writingminds:FFmpegAndroid:0.3.2'
+    compile project(':FFmpegAndroid')
 }
diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
@@ -1,9 +1,7 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
     package="cafe.adriel.androidaudioconverter">
 
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:supportsRtl="true">
+    <application android:label="@string/app_name"/>
 
-    </application>
-
-</manifest>
+</manifest>
diff --git a/lib/src/main/res/values/strings.xml b/lib/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
     <string name="app_name">AndroidAudioConverter</string>
-</resources>
+</resources>
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':lib'
+include ':app', ':lib', ':FFmpegAndroid'

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+configurations.maybeCreate("default")`
	`2`	`+artifacts.add("default", file('FFmpegAndroid.aar'))`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ android {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`dependencies {`
`22`		`- compile fileTree(dir: 'libs', include: ['*.jar'])`
`23`	`22`	`compile project(':lib')`
`24`	`23`	`compile 'com.android.support:appcompat-v7:24.2.0'`
`25`		`-}`
	`24`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,9 @@`
`1`		`-// Top-level build file where you can add configuration options common to all sub-projects/modules.`
`2`		`-`
`3`	`1`	`buildscript {`
`4`	`2`	`repositories {`
`5`	`3`	`jcenter()`
`6`	`4`	`}`
`7`	`5`	`dependencies {`
`8`	`6`	`classpath 'com.android.tools.build:gradle:2.2.0-rc2'`
`9`		`-`
`10`		`- // NOTE: Do not place your application dependencies here; they belong`
`11`		`- // in the individual module build.gradle files`
`12`	`7`	`}`
`13`	`8`	`}`
`14`	`9`
`@@ -20,4 +15,4 @@ allprojects {`
`20`	`15`
`21`	`16`	`task clean(type: Delete) {`
`22`	`17`	`delete rootProject.buildDir`
`23`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ android {`
`9`	`9`	`targetSdkVersion 24`
`10`	`10`	`versionCode 1`
`11`	`11`	`versionName "1.0"`
`12`		`-`
`13`	`12`	`}`
`14`	`13`	`buildTypes {`
`15`	`14`	`release {`
`@@ -20,5 +19,5 @@ android {`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`dependencies {`
`23`		`- compile 'com.writingminds:FFmpegAndroid:0.3.2'`
	`22`	`+ compile project(':FFmpegAndroid')`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include ':app', ':lib'`
	`1`	`+include ':app', ':lib', ':FFmpegAndroid'`