Skip to content

Commit 6b4bf09

Browse files
committed
Update to 4.15
1 parent b0611c5 commit 6b4bf09

File tree

4 files changed

+15
-21
lines changed

4 files changed

+15
-21
lines changed

android-videostreamdecodingsample/app/build.gradle

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ repositories {
55
}
66

77
android {
8-
compileSdkVersion 29
9-
buildToolsVersion '29.0.3'
8+
compileSdkVersion 30
9+
buildToolsVersion '30.0.2'
1010
useLibrary 'org.apache.http.legacy'
1111

1212
defaultConfig {
1313
applicationId "com.dji.videostreamdecodingsample"
1414
minSdkVersion 19
15-
targetSdkVersion 29
15+
targetSdkVersion 30
1616
multiDexEnabled true
1717
ndk {
1818
// On x86 devices that run Android API 23 or above, if the application is targeted with API 23 or
@@ -80,7 +80,7 @@ android {
8080
dependencies {
8181
implementation 'androidx.multidex:multidex:2.0.0'
8282
implementation 'com.squareup:otto:1.3.8'
83-
implementation('com.dji:dji-sdk:4.14-trial1', {
83+
implementation('com.dji:dji-sdk:4.15', {
8484
/**
8585
* Uncomment the "library-anti-distortion" if your app does not need Anti Distortion for Mavic 2 Pro and Mavic 2 Zoom.
8686
* Uncomment the "fly-safe-database" if you need database for release, or we will download it when DJISDKManager.getInstance().registerApp
@@ -90,17 +90,12 @@ dependencies {
9090
exclude module: 'library-anti-distortion'
9191
//exclude module: 'fly-safe-database'
9292
})
93-
compileOnly 'com.dji:dji-sdk-provided:4.14-trial1'
93+
compileOnly 'com.dji:dji-sdk-provided:4.15'
9494

95-
implementation 'androidx.appcompat:appcompat:1.0.0'
96-
implementation 'androidx.core:core:1.0.0'
97-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
98-
implementation 'androidx.recyclerview:recyclerview:1.0.0'
99-
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0-rc01'
100-
implementation 'androidx.annotation:annotation:1.0.0'
95+
implementation 'androidx.appcompat:appcompat:1.2.0'
96+
implementation 'androidx.core:core:1.3.2'
97+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
98+
implementation 'androidx.recyclerview:recyclerview:1.1.0'
99+
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
100+
implementation 'androidx.annotation:annotation:1.2.0'
101101
}
102-
103-
// Please uncomment the following code if you use your own sdk version.
104-
// If can't get the file, Try a few times more
105-
//apply from : "https://terra-1-g.djicdn.com/71a7d383e71a4fb8887a310eb746b47f/msdk/Android-CommonConfig/config_sample_all.gradle"
106-

android-videostreamdecodingsample/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
65
google()
6+
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:4.2.1'
1010

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

1616
allprojects {
1717
repositories {
18-
jcenter()
1918
google()
19+
mavenCentral()
2020
}
2121
}
2222

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
android.useDeprecatedNdk=true
21
org.gradle.jvmargs=-Xmx4608M
32
android.useAndroidX=true
43
android.enableJetifier=true

android-videostreamdecodingsample/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-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip

0 commit comments

Comments
 (0)