Skip to content

Commit

Permalink
update 4.15.1
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel.chen committed Dec 17, 2021
2 parents c0f8da8 + b9a0dd7 commit 6db3e40
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This sample code demonstrates how to use [FFmpeg](https://ffmpeg.org) for video

- Android Studio 2.0+
- Android System 4.2+
- DJI Android SDK 4.14-trial1
- DJI Android SDK 4.15

## IMPORTANT: Install `git lfs`

Expand Down
23 changes: 9 additions & 14 deletions android-videostreamdecodingsample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ repositories {
}

android {
compileSdkVersion 29
buildToolsVersion '29.0.3'
compileSdkVersion 30
buildToolsVersion '30.0.2'
useLibrary 'org.apache.http.legacy'

defaultConfig {
applicationId "com.dji.videostreamdecodingsample"
minSdkVersion 19
targetSdkVersion 29
targetSdkVersion 30
multiDexEnabled true
ndk {
// On x86 devices that run Android API 23 or above, if the application is targeted with API 23 or
Expand Down Expand Up @@ -92,15 +92,10 @@ dependencies {
})
compileOnly 'com.dji:dji-sdk-provided:4.15.1'

implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.core:core:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0-rc01'
implementation 'androidx.annotation:annotation:1.0.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.core:core:1.3.2'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.annotation:annotation:1.2.0'
}

// Please uncomment the following code if you use your own sdk version.
// If can't get the file, Try a few times more
//apply from : "https://terra-1-g.djicdn.com/71a7d383e71a4fb8887a310eb746b47f/msdk/Android-CommonConfig/config_sample_all.gradle"

6 changes: 3 additions & 3 deletions android-videostreamdecodingsample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

buildscript {
repositories {
jcenter()
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:4.2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -15,8 +15,8 @@ buildscript {

allprojects {
repositories {
jcenter()
google()
mavenCentral()
}
}

Expand Down
1 change: 0 additions & 1 deletion android-videostreamdecodingsample/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
android.useDeprecatedNdk=true
org.gradle.jvmargs=-Xmx4608M
android.useAndroidX=true
android.enableJetifier=true
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip

0 comments on commit 6db3e40

Please sign in to comment.