Skip to content

Commit f5e2e0a

Browse files
wseemannwseemann
committed
v1.0.17
1 parent 1cca1d6 commit f5e2e0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+189
-235
lines changed

‎README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@ Using FMMR in your application (Android Studio)
4646
Add the following maven dependency to your project's `build.gradle` file:
4747

4848
dependencies {
49-
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.16'
50-
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native:1.0.16'
49+
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.17'
50+
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native:1.0.17'
5151
}
5252

5353
Optionally, to support individual ABIs:
5454

5555
dependencies {
56-
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.16'
57-
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-armeabi-v7a:1.0.16'
58-
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86:1.0.16'
59-
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86_64:1.0.16'
60-
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-arm64-v8a:1.0.16'
56+
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.17'
57+
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-armeabi-v7a:1.0.17'
58+
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86:1.0.17'
59+
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86_64:1.0.17'
60+
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-arm64-v8a:1.0.17'
6161
}
6262

6363
or, if your application supports individual architectures extract the appropriate AAR file into you projects "libs" folder:
6464

65-
[Prebuilt AARs](https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.16/prebuilt-aars.zip)
65+
[Prebuilt AARs](https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.17/prebuilt-aars.zip)
6666

6767
Demo Application
6868
------------
@@ -75,7 +75,7 @@ Installation
7575
FFmpegMediaMetadataRetriever relies on FFmpeg and native code. The build process
7676
is complex and may be confusing for those unfamiliar the Android NDK. For this
7777
reason I've precompiled AARs created by the build process and checked them
78-
in [here](https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.16/prebuilt-aars.zip).
78+
in [here](https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.17/prebuilt-aars.zip).
7979
The modules are also included with the library. If you don't want to build the modules
8080
you can simple unzip the prebuilt ones and copy them to your projects "libs" folder. (Note:
8181
copy them to YOUR projects "libs" folder, NOT the "libs" folder located in

‎build.gradle‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
buildscript {
44
apply from: 'versions.gradle'
55

6-
repositories {
7-
google()
8-
mavenCentral()
9-
}
106
dependencies {
11-
classpath 'com.android.tools.build:gradle:7.0.2'
12-
137
// NOTE: Do not place your application dependencies here; they belong
148
// in the individual module build.gradle files
159
}
1610
}
1711

12+
plugins {
13+
id 'com.android.library' version '7.3.0' apply false
14+
id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
15+
}
16+
1817
allprojects {
1918
repositories {
2019
google()

‎core/build.gradle‎

Lines changed: 35 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
apply plugin: 'com.android.library'
22
apply from: "$rootProject.projectDir/publishing.gradle"
33

4-
buildscript {
5-
repositories {
6-
google()
7-
mavenCentral()
8-
maven {
9-
url "https://plugins.gradle.org/m2/"
10-
}
11-
}
12-
}
13-
144
android {
15-
compileSdkVersion 31
5+
compileSdk versions.get("compileSdkVersion")
166

177
defaultConfig {
188
minSdkVersion versions.get("minSdkVersion")
@@ -27,54 +17,55 @@ android {
2717
buildTypes {
2818
release {
2919
minifyEnabled false
30-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
3120
}
3221
}
3322

34-
afterEvaluate {
35-
publishing {
36-
publications {
37-
release(MavenPublication) {
38-
from components.release
23+
publishing {
24+
singleVariant('release')
25+
}
26+
}
3927

40-
groupId = 'com.github.wseemann'
41-
artifactId = 'FFmpegMediaMetadataRetriever-core'
42-
version = "$project.android.defaultConfig.versionName"
28+
afterEvaluate {
29+
publishing {
30+
publications {
31+
release(MavenPublication) {
32+
from components.release
4333

44-
pom {
45-
name = 'FFmpegMediaMetadataRetriever-core'
46-
description = 'FFmpegMediaMetadataRetriever library'
47-
url = 'https://github.com/wseemann/FFmpegMediaMetadataRetriever'
48-
packaging = 'aar'
49-
licenses {
50-
license {
51-
name = 'Apache License, Version 2.0'
52-
url = 'http://www.apache.org/licenses/LICENSE-2.0'
53-
distribution = 'repo'
54-
}
55-
}
56-
developers {
57-
developer {
58-
id = 'wseemann'
59-
name = 'William Seemann'
60-
}
34+
groupId = 'com.github.wseemann'
35+
artifactId = 'FFmpegMediaMetadataRetriever-core'
36+
version = "$project.android.defaultConfig.versionName"
37+
38+
pom {
39+
name = 'FFmpegMediaMetadataRetriever-core'
40+
description = 'FFmpegMediaMetadataRetriever library'
41+
url = 'https://github.com/wseemann/FFmpegMediaMetadataRetriever'
42+
packaging = 'aar'
43+
licenses {
44+
license {
45+
name = 'Apache License, Version 2.0'
46+
url = 'http://www.apache.org/licenses/LICENSE-2.0'
47+
distribution = 'repo'
6148
}
62-
scm {
63-
connection = 'scm:hg:https://github.com/wseemann/FFmpegMediaMetadataRetriever'
64-
developerConnection = 'scm:hg:https://github.com/wseemann/FFmpegMediaMetadataRetriever'
65-
url = 'https://github.com/wseemann/FFmpegMediaMetadataRetriever'
49+
}
50+
developers {
51+
developer {
52+
id = 'wseemann'
53+
name = 'William Seemann'
6654
}
6755
}
56+
scm {
57+
connection = 'scm:hg:https://github.com/wseemann/FFmpegMediaMetadataRetriever'
58+
developerConnection = 'scm:hg:https://github.com/wseemann/FFmpegMediaMetadataRetriever'
59+
url = 'https://github.com/wseemann/FFmpegMediaMetadataRetriever'
60+
}
6861
}
6962
}
7063
}
7164
}
7265
}
7366

7467
dependencies {
75-
implementation fileTree(dir: 'libs', include: ['*.jar'])
76-
77-
implementation 'androidx.appcompat:appcompat:1.3.1'
68+
implementation 'androidx.appcompat:appcompat:1.5.1'
7869
testImplementation 'junit:junit:4.13.2'
7970
androidTestImplementation 'androidx.test:runner:1.4.0'
8071
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

‎core/proguard-rules.pro‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎core/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@
33

44
<uses-permission android:name="android.permission.INTERNET" />
55

6-
<application/>
7-
86
</manifest>

‎fmmr-demo/build.gradle‎

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

33
android {
4-
compileSdkVersion 31
4+
compileSdk versions.get("compileSdkVersion")
55

66
defaultConfig {
77
applicationId "wseemann.media.fmpdemo"
8-
minSdkVersion 14
9-
targetSdkVersion 31
10-
versionCode 41
11-
versionName "1.0.11"
8+
minSdkVersion versions.get("minSdkVersion")
9+
targetSdkVersion versions.get("targetSdkVersion")
10+
versionCode 42
11+
versionName "1.0.12"
1212
}
13+
1314
buildTypes {
1415
debug {
1516
debuggable true
1617
}
17-
1818
release {
1919
debuggable false
2020
minifyEnabled false
@@ -26,16 +26,16 @@ android {
2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828

29-
//implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.15'
30-
//implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-armeabi-v7a:1.0.15'
31-
//implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86:1.0.15'
32-
//implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86_64:1.0.15'
33-
//implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-arm64-v8a:1.0.15'
29+
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.17'
30+
//implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-armeabi-v7a:1.0.17'
31+
implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86:1.0.17'
32+
//implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86_64:1.0.17'
33+
//implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-arm64-v8a:1.0.17'
3434

35-
implementation project(':native')
36-
implementation project(path: ':core')
35+
// implementation project(':native')
36+
// implementation project(':core')
3737

38-
implementation 'androidx.appcompat:appcompat:1.3.1'
38+
implementation 'androidx.appcompat:appcompat:1.5.1'
3939

4040
testImplementation 'junit:junit:4.13.2'
4141
}

‎fmmr-demo/release/output.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎gradle.properties‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@
2121
android.useAndroidX=true
2222
android.enableJetifier=true
2323

24-
USERNAME=wseemann
25-
PASSWORD=xxxxxxxx#6
24+
sonatype_username=wseemann
25+
sonatype_password=xxxxxxxx#6
2626

2727
signing.keyId=94F92DAB
2828
signing.password=Xxxxxxxx55
29-
signing.secretKeyRingFile=/Users/wseemann/.gnupg/secring.gpg
29+
signing.secretKeyRingFile=/Users/wseemann/.gnupg/secring.gpg
30+
31+
android.disableAutomaticComponentCreation=true

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sun Nov 14 19:26:36 PST 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

‎local.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
# header note.
1010
#Thu May 18 00:54:08 CDT 2017
1111
sdk.dir=/Users/wseemann/Library/Android/sdk
12-
ndk.dir=/Users/wseemann/Android/android-ndk-r20
12+
ndk.dir=/Users/wseemann/Library/Android/sdk/ndk/25.1.8937393

0 commit comments

Comments
 (0)