Skip to content

Commit 41b6d14

Browse files
author
jacob-tabak
committed
Update for AS 1.X
1 parent 9f4e487 commit 41b6d14

File tree

5 files changed

+42
-30
lines changed

5 files changed

+42
-30
lines changed

‎FFmpegAndroid/build.gradle‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 16
5-
buildToolsVersion "20.0.0"
4+
compileSdkVersion rootProject.ext.compileSdkVersion as Integer
5+
buildToolsVersion rootProject.ext.buildToolsVersion as String
66

77
defaultConfig {
8-
applicationId "com.github.hiteshsondhi88.libffmpeg"
9-
minSdkVersion 16
10-
targetSdkVersion 16
11-
versionCode 25
12-
versionName "0.2.5"
8+
minSdkVersion rootProject.ext.minSdkVersion as Integer
9+
targetSdkVersion rootProject.ext.targetSdkVersion as Integer
10+
versionCode rootProject.ext.versionCode as Integer
11+
versionName rootProject.ext.versionName as String
1312
}
1413

1514
sourceSets.main {
@@ -20,7 +19,7 @@ android {
2019

2120
buildTypes {
2221
release {
23-
runProguard false
22+
minifyEnabled false
2423
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2524
}
2625
}

‎app/app.iml‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ffmpeg-android-java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ffmpeg-android-java-hite" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -9,11 +9,13 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1213
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1314
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
14-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
16+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
18+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1719
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1820
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1921
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -23,18 +25,21 @@
2325
</component>
2426
<component name="NewModuleRootManager" inherit-compiler-output="false">
2527
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
2629
<exclude-output />
2730
<content url="file://$MODULE_DIR$">
2831
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
2932
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3033
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3134
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3235
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
3843
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
3944
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4045
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -77,18 +82,17 @@
7782
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
7883
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
7984
</content>
80-
<orderEntry type="jdk" jdkName="Android API 16 Platform" jdkType="Android SDK" />
85+
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
8186
<orderEntry type="sourceFolder" forTests="false" />
8287
<orderEntry type="library" exported="" name="guava-15.0" level="project" />
8388
<orderEntry type="library" exported="" name="dagger-1.2.2" level="project" />
8489
<orderEntry type="library" exported="" scope="TEST" name="assertj-android-1.0.0" level="project" />
8590
<orderEntry type="library" exported="" name="javax.inject-1" level="project" />
86-
<orderEntry type="library" exported="" scope="TEST" name="assertj-core-1.6.1" level="project" />
8791
<orderEntry type="library" exported="" scope="TEST" name="support-annotations-20.0.0" level="project" />
92+
<orderEntry type="library" exported="" scope="TEST" name="assertj-core-1.6.1" level="project" />
8893
<orderEntry type="library" exported="" name="dagger-compiler-1.2.2" level="project" />
8994
<orderEntry type="library" exported="" name="butterknife-5.1.2" level="project" />
9095
<orderEntry type="library" exported="" name="javawriter-2.5.0" level="project" />
9196
<orderEntry type="module" module-name="FFmpegAndroid" exported="" />
9297
</component>
93-
</module>
94-
98+
</module>

‎app/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 16
5-
buildToolsVersion "20.0.0"
4+
compileSdkVersion rootProject.ext.compileSdkVersion as Integer
5+
buildToolsVersion rootProject.ext.buildToolsVersion as String
66

77
defaultConfig {
88
applicationId "com.github.hiteshsondhi88.sampleffmpeg"
9-
minSdkVersion 16
10-
targetSdkVersion 20
11-
versionCode 25
12-
versionName "0.2.5"
9+
minSdkVersion rootProject.ext.minSdkVersion as Integer
10+
targetSdkVersion rootProject.ext.targetSdkVersion as Integer
11+
versionCode rootProject.ext.versionCode as Integer
12+
versionName rootProject.ext.versionName as String
1313
}
1414

1515
sourceSets.main {
@@ -24,7 +24,7 @@ android {
2424

2525
buildTypes {
2626
release {
27-
runProguard false
27+
minifyEnabled false
2828
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2929
}
3030
}

‎build.gradle‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:0.13.0'
8+
classpath 'com.android.tools.build:gradle:1.1.0'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
@@ -17,3 +17,12 @@ allprojects {
1717
jcenter()
1818
}
1919
}
20+
21+
ext {
22+
compileSdkVersion = 22
23+
buildToolsVersion = '22'
24+
targetSdkVersion = 22
25+
minSdkVersion = 16
26+
versionCode = 25
27+
versionName = "0.2.5"
28+
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Sep 19 11:20:39 GMT+05:30 2014
1+
#Tue Mar 17 16:54:04 CDT 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

0 commit comments

Comments
 (0)