Skip to content

Commit 64c2888

Browse files
Merge pull request #25 from SimformSolutionsPvtLtd/bugfix/#22_minsdkchange_to_24
🐛 - min sdk change to 24
2 parents 56b0121 + 80646da commit 64c2888

File tree

6 files changed

+38
-21
lines changed

6 files changed

+38
-21
lines changed

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# FFMPEG video operations
22

3-
[![Kotlin Version](https://img.shields.io/badge/Kotlin-1.4.21-blue.svg)](https://kotlinlang.org) [![Platform](https://img.shields.io/badge/Platform-Android-green.svg?style=flat)](https://www.android.com/) [![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19) [![Android Arsenal]( https://img.shields.io/badge/Android%20Arsenal-SSffmpegVideoOperation-green.svg?style=flat )]( https://android-arsenal.com/details/1/8250 )
3+
[![Kotlin Version](https://img.shields.io/badge/Kotlin-1.5.30-blue.svg)](https://kotlinlang.org)
4+
[![Platform](https://img.shields.io/badge/Platform-Android-green.svg?style=flat)](https://www.
5+
android.com/) [![API](https://img.shields.io/badge/API-24%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19) [![Android Arsenal]( https://img.shields.io/badge/Android%20Arsenal-SSffmpegVideoOperation-green.svg?style=flat )]( https://android-arsenal.com/details/1/8250 )
46

57

68
FFmpeg compiled for Android.
@@ -52,7 +54,7 @@ FFmpeg Android runs on the following architectures:
5254
- Multi-threading
5355
- Supports zlib and Media-codec system libraries
5456
- Camera access on supported devices
55-
- Supports API Level 21+
57+
- Supports API Level 24+
5658

5759
### Support target sdk
5860
- 30
@@ -76,7 +78,7 @@ FFmpeg Android runs on the following architectures:
7678

7779
```
7880
dependencies {
79-
implementation 'com.github.SimformSolutionsPvtLtd:SSffmpegVideoOperation:1.0.6'
81+
implementation 'com.github.SimformSolutionsPvtLtd:SSffmpegVideoOperation:1.0.7'
8082
}
8183
```
8284

SSffmpegVideoOperation/build.gradle

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,30 @@
11
plugins {
22
id 'com.android.library'
33
id 'kotlin-android'
4+
id 'maven-publish'
5+
}
6+
7+
afterEvaluate {
8+
publishing {
9+
publications {
10+
// Creates a Maven publication called "release".
11+
release(MavenPublication) {
12+
from components.release
13+
groupId = 'com.simform.videooperations'
14+
artifactId = 'videooperations'
15+
version = '1.0.7'
16+
}
17+
}
18+
}
419
}
520

621
android {
722
compileSdkVersion 30
823
buildToolsVersion "29.0.3"
924

1025
defaultConfig {
11-
minSdkVersion 21
26+
minSdkVersion 24
1227
targetSdkVersion 30
13-
versionCode 1
14-
versionName "1.0"
1528

1629
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1730
consumerProguardFiles "consumer-rules.pro"
@@ -28,11 +41,11 @@ android {
2841
}
2942
}
3043
compileOptions {
31-
sourceCompatibility JavaVersion.VERSION_1_8
32-
targetCompatibility JavaVersion.VERSION_1_8
44+
sourceCompatibility JavaVersion.VERSION_11
45+
targetCompatibility JavaVersion.VERSION_11
3346
}
3447
kotlinOptions {
35-
jvmTarget = '1.8'
48+
jvmTarget = '11'
3649
}
3750
packagingOptions {
3851
exclude 'META-INF/rxjava.properties'
@@ -50,9 +63,9 @@ android {
5063

5164
dependencies {
5265
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
53-
implementation 'androidx.core:core-ktx:1.3.2'
54-
implementation 'androidx.appcompat:appcompat:1.2.0'
55-
implementation 'com.google.android.material:material:1.2.1'
66+
implementation 'androidx.core:core-ktx:1.6.0'
67+
implementation 'androidx.appcompat:appcompat:1.3.1'
68+
implementation 'com.google.android.material:material:1.4.0'
5669
implementation 'pub.devrel:easypermissions:3.0.0'
5770
implementation 'com.arthenica:mobile-ffmpeg-full:4.4'
5871
implementation 'com.github.jaiselrahman:FilePicker:1.3.2'

app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010

1111
defaultConfig {
1212
applicationId "com.simform.videoimageeditor"
13-
minSdkVersion 21
13+
minSdkVersion 24
1414
targetSdkVersion 30
1515
versionCode 1
1616
versionName "1.0"
@@ -24,7 +24,7 @@ android {
2424
}
2525
}
2626
kotlinOptions {
27-
jvmTarget = '1.8'
27+
jvmTarget = '11'
2828
}
2929
flavorDimensions "default"
3030

@@ -44,12 +44,12 @@ kapt {
4444

4545
dependencies {
4646
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
47-
implementation 'androidx.core:core-ktx:1.3.2'
48-
implementation 'androidx.appcompat:appcompat:1.2.0'
47+
implementation 'androidx.core:core-ktx:1.6.0'
48+
implementation 'androidx.appcompat:appcompat:1.3.1'
4949
implementation 'com.github.bumptech.glide:glide:4.12.0'
5050
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
51-
implementation 'com.google.android.material:material:1.3.0'
52-
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
51+
implementation 'com.google.android.material:material:1.4.0'
52+
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
5353
implementation 'pub.devrel:easypermissions:3.0.0'
5454
implementation 'com.github.jaiselrahman:FilePicker:1.3.2'
5555
implementation 'com.kovachcode:timePickerWithSeconds:1.0.1'

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = '1.4.21'
3+
ext.kotlin_version = '1.5.30'
44
repositories {
55
jcenter()
66
maven { url "https://jitpack.io" }
77
google()
88
}
99
dependencies {
10-
classpath "com.android.tools.build:gradle:4.0.1"
10+
classpath 'com.android.tools.build:gradle:7.0.2'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1313
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

jitpack.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
jdk:
2+
- openjdk11

0 commit comments

Comments
 (0)