Skip to content

Commit 90966b1

Browse files
author
Daniel Wang
committed
fix: modern Android Studio
1 parent 30eb944 commit 90966b1

File tree

10 files changed

+41
-33
lines changed

10 files changed

+41
-33
lines changed

android/ijkplayer/build.gradle

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,37 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
5+
mavenCentral()
6+
google()
7+
maven {
8+
url "https://plugins.gradle.org/m2/"
9+
}
610
}
711
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.3'
12+
classpath 'com.android.tools.build:gradle:8.4.0'
913

10-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
11-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
14+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
15+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
1216
// NOTE: Do not place your application dependencies here; they belong
1317
// in the individual module build.gradle files
1418
}
1519
}
1620

1721
allprojects {
1822
repositories {
19-
jcenter()
23+
mavenCentral()
24+
google()
25+
maven {
26+
url "https://plugins.gradle.org/m2/"
27+
}
2028
}
2129
}
2230

2331
ext {
24-
compileSdkVersion = 25
25-
buildToolsVersion = "25.0.3"
32+
compileSdkVersion = 28
33+
buildToolsVersion = "28.0.3"
2634

27-
targetSdkVersion = 25
35+
targetSdkVersion = 28
2836

2937
versionCode = 800800
3038
versionName = "0.8.8"

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

android/ijkplayer/ijkplayer-arm64/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
}
2929

3030
apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");

android/ijkplayer/ijkplayer-armv5/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
}
2929

3030
apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");

android/ijkplayer/ijkplayer-armv7a/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
}
2929

3030
apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");

android/ijkplayer/ijkplayer-example/build.gradle

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,25 @@ android {
3434
}
3535

3636
dependencies {
37-
compile fileTree(include: ['*.jar'], dir: 'libs')
38-
compile 'com.android.support:appcompat-v7:23.0.1'
39-
compile 'com.android.support:preference-v7:23.0.1'
40-
compile 'com.android.support:support-annotations:23.0.1'
37+
implementation fileTree(include: ['*.jar'], dir: 'libs')
38+
implementation 'com.android.support:appcompat-v7:23.0.1'
39+
implementation 'com.android.support:preference-v7:23.0.1'
40+
implementation 'com.android.support:support-annotations:23.0.1'
4141

42-
compile 'com.squareup:otto:1.3.8'
42+
implementation 'com.squareup:otto:1.3.8'
4343

44-
compile project(':ijkplayer-java')
45-
compile project(':ijkplayer-exo')
44+
implementation project(':ijkplayer-java')
45+
implementation project(':ijkplayer-exo')
4646

47-
all32Compile project(':ijkplayer-armv5')
48-
all32Compile project(':ijkplayer-armv7a')
49-
all32Compile project(':ijkplayer-x86')
47+
all32Implementation project(':ijkplayer-armv5')
48+
all32Implementation project(':ijkplayer-armv7a')
49+
all32Implementation project(':ijkplayer-x86')
5050

51-
all64Compile project(':ijkplayer-armv5')
52-
all64Compile project(':ijkplayer-armv7a')
53-
all64Compile project(':ijkplayer-arm64')
54-
all64Compile project(':ijkplayer-x86')
55-
all64Compile project(':ijkplayer-x86_64')
51+
all64Implementation project(':ijkplayer-armv5')
52+
all64Implementation project(':ijkplayer-armv7a')
53+
all64Implementation project(':ijkplayer-arm64')
54+
all64Implementation project(':ijkplayer-x86')
55+
all64Implementation project(':ijkplayer-x86_64')
5656

5757
// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
5858
// compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.8.8'

android/ijkplayer/ijkplayer-exo/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ android {
2323
}
2424

2525
dependencies {
26-
compile fileTree(dir: 'libs', include: ['*.jar'])
26+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2727

28-
compile 'com.google.android.exoplayer:exoplayer:r1.5.11'
28+
implementation 'com.google.android.exoplayer:exoplayer:r1.5.11'
2929

30-
compile project(':ijkplayer-java')
30+
implementation project(':ijkplayer-java')
3131
// compile 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
3232
}
3333

android/ijkplayer/ijkplayer-java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ android {
2323
}
2424

2525
dependencies {
26-
compile fileTree(dir: 'libs', include: ['*.jar'])
26+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2727
}
2828

2929
apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");

android/ijkplayer/ijkplayer-x86/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
}
2929

3030
apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");

android/ijkplayer/ijkplayer-x86_64/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
}
2929

3030
apply from: new File(rootProject.projectDir, "tools/gradle-on-demand.gradle");

0 commit comments

Comments
 (0)