v1.0.17

wseemann · Sep 30, 2022 · f5e2e0a · f5e2e0a
1 parent 1cca1d6
commit f5e2e0a
Show file tree

Hide file tree

Showing 48 changed files with 189 additions and 235 deletions.
diff --git a/README.md b/README.md
@@ -46,23 +46,23 @@ Using FMMR in your application (Android Studio)
 Add the following maven dependency to your project's `build.gradle` file:
 
     dependencies {
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.16'
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native:1.0.16'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.17'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native:1.0.17'
     }
 
 Optionally, to support individual ABIs:
 
     dependencies {
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.16'
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-armeabi-v7a:1.0.16'
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86:1.0.16'
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86_64:1.0.16'
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-arm64-v8a:1.0.16'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.17'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-armeabi-v7a:1.0.17'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86:1.0.17'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86_64:1.0.17'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-arm64-v8a:1.0.17'
     }
 
 or, if your application supports individual architectures extract the appropriate AAR file into you projects "libs" folder:
 
-[Prebuilt AARs](https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.16/prebuilt-aars.zip)
+[Prebuilt AARs](https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.17/prebuilt-aars.zip)
 
 Demo Application
 ------------
@@ -75,7 +75,7 @@ Installation
 FFmpegMediaMetadataRetriever relies on FFmpeg and native code. The build process
 is complex and may be confusing for those unfamiliar the Android NDK. For this
 reason I've precompiled AARs created by the build process and checked them
-in [here](https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.16/prebuilt-aars.zip).
+in [here](https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.17/prebuilt-aars.zip).
 The modules are also included with the library. If you don't want to build the modules
 you can simple unzip the prebuilt ones and copy them to your projects "libs" folder. (Note:
 copy them to YOUR projects "libs" folder, NOT the "libs" folder located in

diff --git a/build.gradle b/build.gradle
@@ -3,18 +3,17 @@
 buildscript {
     apply from: 'versions.gradle'
 
-    repositories {
-        google()
-        mavenCentral()
-    }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
+plugins {
+    id 'com.android.library' version '7.3.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
+}
+
 allprojects {
     repositories {
         google()

diff --git a/core/build.gradle b/core/build.gradle
@@ -1,18 +1,8 @@
 apply plugin: 'com.android.library'
 apply from: "$rootProject.projectDir/publishing.gradle"
 
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-}
-
 android {
-    compileSdkVersion 31
+    compileSdk versions.get("compileSdkVersion")
 
     defaultConfig {
         minSdkVersion versions.get("minSdkVersion")
@@ -27,54 +17,55 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
-    afterEvaluate {
-        publishing {
-            publications {
-                release(MavenPublication) {
-                    from components.release
+    publishing {
+        singleVariant('release')
+    }
+}
 
-                    groupId = 'com.github.wseemann'
-                    artifactId = 'FFmpegMediaMetadataRetriever-core'
-                    version = "$project.android.defaultConfig.versionName"
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
 
-                    pom {
-                        name = 'FFmpegMediaMetadataRetriever-core'
-                        description = 'FFmpegMediaMetadataRetriever library'
-                        url = 'https://github.com/wseemann/FFmpegMediaMetadataRetriever'
-                        packaging = 'aar'
-                        licenses {
-                            license {
-                                name = 'Apache License, Version 2.0'
-                                url = 'http://www.apache.org/licenses/LICENSE-2.0'
-                                distribution = 'repo'
-                            }
-                        }
-                        developers {
-                            developer {
-                                id = 'wseemann'
-                                name = 'William Seemann'
-                            }
+                groupId = 'com.github.wseemann'
+                artifactId = 'FFmpegMediaMetadataRetriever-core'
+                version = "$project.android.defaultConfig.versionName"
+
+                pom {
+                    name = 'FFmpegMediaMetadataRetriever-core'
+                    description = 'FFmpegMediaMetadataRetriever library'
+                    url = 'https://github.com/wseemann/FFmpegMediaMetadataRetriever'
+                    packaging = 'aar'
+                    licenses {
+                        license {
+                            name = 'Apache License, Version 2.0'
+                            url = 'http://www.apache.org/licenses/LICENSE-2.0'
+                            distribution = 'repo'
                         }
-                        scm {
-                            connection = 'scm:hg:https://github.com/wseemann/FFmpegMediaMetadataRetriever'
-                            developerConnection = 'scm:hg:https://github.com/wseemann/FFmpegMediaMetadataRetriever'
-                            url = 'https://github.com/wseemann/FFmpegMediaMetadataRetriever'
+                    }
+                    developers {
+                        developer {
+                            id = 'wseemann'
+                            name = 'William Seemann'
                         }
                     }
+                    scm {
+                        connection = 'scm:hg:https://github.com/wseemann/FFmpegMediaMetadataRetriever'
+                        developerConnection = 'scm:hg:https://github.com/wseemann/FFmpegMediaMetadataRetriever'
+                        url = 'https://github.com/wseemann/FFmpegMediaMetadataRetriever'
+                    }
                 }
             }
         }
     }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

diff --git a/core/proguard-rules.pro b/core/proguard-rules.pro
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
@@ -3,6 +3,4 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <application/>
-
 </manifest>
diff --git a/fmmr-demo/build.gradle b/fmmr-demo/build.gradle
@@ -1,20 +1,20 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
+    compileSdk versions.get("compileSdkVersion")
 
     defaultConfig {
         applicationId "wseemann.media.fmpdemo"
-        minSdkVersion 14
-        targetSdkVersion 31
-        versionCode 41
-        versionName "1.0.11"
+        minSdkVersion versions.get("minSdkVersion")
+        targetSdkVersion versions.get("targetSdkVersion")
+        versionCode 42
+        versionName "1.0.12"
     }
+
     buildTypes {
         debug {
             debuggable true
         }
-
         release {
             debuggable false
             minifyEnabled false
@@ -26,16 +26,16 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    //implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.15'
-    //implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-armeabi-v7a:1.0.15'
-    //implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86:1.0.15'
-    //implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86_64:1.0.15'
-    //implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-arm64-v8a:1.0.15'
+    implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.17'
+    //implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-armeabi-v7a:1.0.17'
+    implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86:1.0.17'
+    //implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86_64:1.0.17'
+    //implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-arm64-v8a:1.0.17'
 
-    implementation project(':native')
-    implementation project(path: ':core')
+    // implementation project(':native')
+    // implementation project(':core')
 
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
 
     testImplementation 'junit:junit:4.13.2'
 }
diff --git a/fmmr-demo/release/output.json b/fmmr-demo/release/output.json
diff --git a/gradle.properties b/gradle.properties
@@ -21,9 +21,11 @@
 android.useAndroidX=true
 android.enableJetifier=true
 
-USERNAME=wseemann
-PASSWORD=xxxxxxxx#6
+sonatype_username=wseemann
+sonatype_password=xxxxxxxx#6
 
 signing.keyId=94F92DAB
 signing.password=Xxxxxxxx55
-signing.secretKeyRingFile=/Users/wseemann/.gnupg/secring.gpg
+signing.secretKeyRingFile=/Users/wseemann/.gnupg/secring.gpg
+
+android.disableAutomaticComponentCreation=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Nov 14 19:26:36 PST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/local.properties b/local.properties
@@ -9,4 +9,4 @@
 # header note.
 #Thu May 18 00:54:08 CDT 2017
 sdk.dir=/Users/wseemann/Library/Android/sdk
-ndk.dir=/Users/wseemann/Android/android-ndk-r20
+ndk.dir=/Users/wseemann/Library/Android/sdk/ndk/25.1.8937393